天府通办数据汇聚接口

sst-manager/src/main/java/com/mortals/xhx/daemon/task/ProvinceConvergeTaskImpl.java

+package com.mortals.xhx.daemon.task;
+
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.feign.site.ISiteFeign;
+import com.mortals.xhx.module.converge.service.ConvergeDeviceService;
+import com.mortals.xhx.module.converge.service.ConvergeSiteService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 省平台数据汇聚任务
+ */
+@Slf4j
+@Service("ProvinceConvergeTask")
+public class ProvinceConvergeTaskImpl implements ITaskExcuteService {
+
+    @Autowired
+    private ConvergeSiteService convergeSiteService;
+    @Autowired
+    private ConvergeDeviceService convergeDeviceService;
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        log.info("开始执行省平台数据汇聚任务...");
+        try {
+            convergeSiteService.doConvergeSite();
+            convergeDeviceService.doConvergeDevice();
+
+        }catch (Exception e){
+            log.error("数据汇聚任务执行出错",e);
+        }
+        log.info("省平台数据汇聚任务执行完成");
+    }
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/dao/ConvergeAppsDao.java

+package com.mortals.xhx.module.converge.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
+import java.util.List;
+/**
+* 设备应用Dao
+* 设备应用 DAO接口
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+
+public interface  ConvergeAppsDao extends ICRUDDao<ConvergeAppsEntity,Long>{
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/dao/ConvergeDeviceDao.java

+package com.mortals.xhx.module.converge.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity;
+import java.util.List;
+/**
+* 网点设备Dao
+* 网点设备 DAO接口
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+
+public interface  ConvergeDeviceDao extends ICRUDDao<ConvergeDeviceEntity,Long>{
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/dao/ConvergeSiteDao.java

+package com.mortals.xhx.module.converge.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
+import java.util.List;
+/**
+* 网点信息Dao
+* 网点信息 DAO接口
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+
+public interface  ConvergeSiteDao extends ICRUDDao<ConvergeSiteEntity,Long>{
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/dao/ibatis/ConvergeAppsDaoImpl.java

+package com.mortals.xhx.module.converge.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.converge.dao.ConvergeAppsDao;
+import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 设备应用DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@Repository("convergeAppsDao")
+public class ConvergeAppsDaoImpl extends BaseCRUDDaoMybatis<ConvergeAppsEntity,Long> implements ConvergeAppsDao {
+
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/dao/ibatis/ConvergeDeviceDaoImpl.java

+package com.mortals.xhx.module.converge.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.converge.dao.ConvergeDeviceDao;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 网点设备DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@Repository("convergeDeviceDao")
+public class ConvergeDeviceDaoImpl extends BaseCRUDDaoMybatis<ConvergeDeviceEntity,Long> implements ConvergeDeviceDao {
+
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/dao/ibatis/ConvergeSiteDaoImpl.java

+package com.mortals.xhx.module.converge.dao.ibatis;
+
+
+import org.springframework.stereotype.Repository;
+import com.mortals.xhx.module.converge.dao.ConvergeSiteDao;
+import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
+import java.util.Date;
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import java.util.List;
+/**
+* 网点信息DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@Repository("convergeSiteDao")
+public class ConvergeSiteDaoImpl extends BaseCRUDDaoMybatis<ConvergeSiteEntity,Long> implements ConvergeSiteDao {
+
+
+
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeAppsEntity.java

+package com.mortals.xhx.module.converge.model;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.converge.model.vo.ConvergeAppsVo;
+import lombok.Data;
+/**
+ * 设备应用实体对象
+ *
+ * @author zxfei
+ * @date 2023-06-12
+ */
+@Data
+public class ConvergeAppsEntity extends ConvergeAppsVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 设备ID
+     */
+    private Long equipmentId;
+    /**
+     * 应用标识，具有唯一性
+     */
+    private String appEname;
+    /**
+     * 应用名称
+     */
+    private String appName;
+    /**
+     * 应用简称
+     */
+    private String appSimpleName;
+    /**
+     * 应用提供方
+     */
+    private String provider;
+    /**
+     * 应用来源
+     */
+    private String origin;
+    /**
+     * 应用访问数
+     */
+    private Integer pv;
+    /**
+     * 应用访客数
+     */
+    private Integer uv;
+    /**
+     * 操作类型
+     */
+    private String opr;
+    /**
+     * 站点id
+     */
+    private Long siteId;
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof ConvergeAppsEntity) {
+            ConvergeAppsEntity tmp = (ConvergeAppsEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+        this.equipmentId = -1L;
+
+        this.appEname = "";
+
+        this.appName = "";
+
+        this.appSimpleName = "";
+
+        this.provider = "";
+
+        this.origin = "";
+
+        this.pv = -1;
+
+        this.uv = -1;
+
+        this.opr = "";
+
+        this.siteId = -1L;
+    }
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeAppsQuery.java

+package com.mortals.xhx.module.converge.model;
+
+import java.util.List;
+import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
+/**
+ * 设备应用查询对象
+ *
+ * @author zxfei
+ * @date 2023-06-12
+ */
+public class ConvergeAppsQuery extends ConvergeAppsEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 设备ID */
+    private Long equipmentIdStart;
+
+    /** 结束 设备ID */
+    private Long equipmentIdEnd;
+
+    /** 增加 设备ID */
+    private Long equipmentIdIncrement;
+
+    /** 设备ID列表 */
+    private List <Long> equipmentIdList;
+
+    /** 设备ID排除列表 */
+    private List <Long> equipmentIdNotList;
+
+    /** 应用标识，具有唯一性 */
+    private List<String> appEnameList;
+
+    /** 应用标识，具有唯一性排除列表 */
+    private List <String> appEnameNotList;
+    /** 应用名称 */
+    private List<String> appNameList;
+
+    /** 应用名称排除列表 */
+    private List <String> appNameNotList;
+    /** 应用简称 */
+    private List<String> appSimpleNameList;
+
+    /** 应用简称排除列表 */
+    private List <String> appSimpleNameNotList;
+    /** 应用提供方 */
+    private List<String> providerList;
+
+    /** 应用提供方排除列表 */
+    private List <String> providerNotList;
+    /** 应用来源 */
+    private List<String> originList;
+
+    /** 应用来源排除列表 */
+    private List <String> originNotList;
+    /** 开始 应用访问数 */
+    private Integer pvStart;
+
+    /** 结束 应用访问数 */
+    private Integer pvEnd;
+
+    /** 增加 应用访问数 */
+    private Integer pvIncrement;
+
+    /** 应用访问数列表 */
+    private List <Integer> pvList;
+
+    /** 应用访问数排除列表 */
+    private List <Integer> pvNotList;
+
+    /** 开始 应用访客数 */
+    private Integer uvStart;
+
+    /** 结束 应用访客数 */
+    private Integer uvEnd;
+
+    /** 增加 应用访客数 */
+    private Integer uvIncrement;
+
+    /** 应用访客数列表 */
+    private List <Integer> uvList;
+
+    /** 应用访客数排除列表 */
+    private List <Integer> uvNotList;
+
+    /** 操作类型 */
+    private List<String> oprList;
+
+    /** 操作类型排除列表 */
+    private List <String> oprNotList;
+    /** 开始 站点id */
+    private Long siteIdStart;
+
+    /** 结束 站点id */
+    private Long siteIdEnd;
+
+    /** 增加 站点id */
+    private Long siteIdIncrement;
+
+    /** 站点id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<ConvergeAppsQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<ConvergeAppsQuery> andConditionList;
+
+    public ConvergeAppsQuery(){}
+
+    /**
+     * 获取 开始 序号，主键，自增长
+     * @return idStart
+     */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+     * 设置 开始 序号，主键，自增长
+     * @param idStart
+     */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+     * 获取 结束 序号，主键，自增长
+     * @return $idEnd
+     */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+     * 设置 结束 序号，主键，自增长
+     * @param idEnd
+     */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+     * 获取 增加 序号，主键，自增长
+     * @return idIncrement
+     */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+     * 设置 增加 序号，主键，自增长
+     * @param idIncrement
+     */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+     * 获取 序号，主键，自增长
+     * @return idList
+     */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idList
+     */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+     * 获取 开始 设备ID
+     * @return equipmentIdStart
+     */
+    public Long getEquipmentIdStart(){
+        return this.equipmentIdStart;
+    }
+
+    /**
+     * 设置 开始 设备ID
+     * @param equipmentIdStart
+     */
+    public void setEquipmentIdStart(Long equipmentIdStart){
+        this.equipmentIdStart = equipmentIdStart;
+    }
+
+    /**
+     * 获取 结束 设备ID
+     * @return $equipmentIdEnd
+     */
+    public Long getEquipmentIdEnd(){
+        return this.equipmentIdEnd;
+    }
+
+    /**
+     * 设置 结束 设备ID
+     * @param equipmentIdEnd
+     */
+    public void setEquipmentIdEnd(Long equipmentIdEnd){
+        this.equipmentIdEnd = equipmentIdEnd;
+    }
+
+    /**
+     * 获取 增加 设备ID
+     * @return equipmentIdIncrement
+     */
+    public Long getEquipmentIdIncrement(){
+        return this.equipmentIdIncrement;
+    }
+
+    /**
+     * 设置 增加 设备ID
+     * @param equipmentIdIncrement
+     */
+    public void setEquipmentIdIncrement(Long equipmentIdIncrement){
+        this.equipmentIdIncrement = equipmentIdIncrement;
+    }
+
+    /**
+     * 获取 设备ID
+     * @return equipmentIdList
+     */
+    public List<Long> getEquipmentIdList(){
+        return this.equipmentIdList;
+    }
+
+    /**
+     * 设置 设备ID
+     * @param equipmentIdList
+     */
+    public void setEquipmentIdList(List<Long> equipmentIdList){
+        this.equipmentIdList = equipmentIdList;
+    }
+
+    /**
+     * 获取 设备ID
+     * @return equipmentIdNotList
+     */
+    public List<Long> getEquipmentIdNotList(){
+        return this.equipmentIdNotList;
+    }
+
+    /**
+     * 设置 设备ID
+     * @param equipmentIdNotList
+     */
+    public void setEquipmentIdNotList(List<Long> equipmentIdNotList){
+        this.equipmentIdNotList = equipmentIdNotList;
+    }
+
+
+    /**
+     * 获取 应用标识，具有唯一性
+     * @return appEnameList
+     */
+    public List<String> getAppEnameList(){
+        return this.appEnameList;
+    }
+
+    /**
+     * 设置 应用标识，具有唯一性
+     * @param appEnameList
+     */
+    public void setAppEnameList(List<String> appEnameList){
+        this.appEnameList = appEnameList;
+    }
+
+    /**
+     * 获取 应用标识，具有唯一性
+     * @return appEnameNotList
+     */
+    public List<String> getAppEnameNotList(){
+        return this.appEnameNotList;
+    }
+
+    /**
+     * 设置 应用标识，具有唯一性
+     * @param appEnameNotList
+     */
+    public void setAppEnameNotList(List<String> appEnameNotList){
+        this.appEnameNotList = appEnameNotList;
+    }
+
+    /**
+     * 获取 应用名称
+     * @return appNameList
+     */
+    public List<String> getAppNameList(){
+        return this.appNameList;
+    }
+
+    /**
+     * 设置 应用名称
+     * @param appNameList
+     */
+    public void setAppNameList(List<String> appNameList){
+        this.appNameList = appNameList;
+    }
+
+    /**
+     * 获取 应用名称
+     * @return appNameNotList
+     */
+    public List<String> getAppNameNotList(){
+        return this.appNameNotList;
+    }
+
+    /**
+     * 设置 应用名称
+     * @param appNameNotList
+     */
+    public void setAppNameNotList(List<String> appNameNotList){
+        this.appNameNotList = appNameNotList;
+    }
+
+    /**
+     * 获取 应用简称
+     * @return appSimpleNameList
+     */
+    public List<String> getAppSimpleNameList(){
+        return this.appSimpleNameList;
+    }
+
+    /**
+     * 设置 应用简称
+     * @param appSimpleNameList
+     */
+    public void setAppSimpleNameList(List<String> appSimpleNameList){
+        this.appSimpleNameList = appSimpleNameList;
+    }
+
+    /**
+     * 获取 应用简称
+     * @return appSimpleNameNotList
+     */
+    public List<String> getAppSimpleNameNotList(){
+        return this.appSimpleNameNotList;
+    }
+
+    /**
+     * 设置 应用简称
+     * @param appSimpleNameNotList
+     */
+    public void setAppSimpleNameNotList(List<String> appSimpleNameNotList){
+        this.appSimpleNameNotList = appSimpleNameNotList;
+    }
+
+    /**
+     * 获取 应用提供方
+     * @return providerList
+     */
+    public List<String> getProviderList(){
+        return this.providerList;
+    }
+
+    /**
+     * 设置 应用提供方
+     * @param providerList
+     */
+    public void setProviderList(List<String> providerList){
+        this.providerList = providerList;
+    }
+
+    /**
+     * 获取 应用提供方
+     * @return providerNotList
+     */
+    public List<String> getProviderNotList(){
+        return this.providerNotList;
+    }
+
+    /**
+     * 设置 应用提供方
+     * @param providerNotList
+     */
+    public void setProviderNotList(List<String> providerNotList){
+        this.providerNotList = providerNotList;
+    }
+
+    /**
+     * 获取 应用来源
+     * @return originList
+     */
+    public List<String> getOriginList(){
+        return this.originList;
+    }
+
+    /**
+     * 设置 应用来源
+     * @param originList
+     */
+    public void setOriginList(List<String> originList){
+        this.originList = originList;
+    }
+
+    /**
+     * 获取 应用来源
+     * @return originNotList
+     */
+    public List<String> getOriginNotList(){
+        return this.originNotList;
+    }
+
+    /**
+     * 设置 应用来源
+     * @param originNotList
+     */
+    public void setOriginNotList(List<String> originNotList){
+        this.originNotList = originNotList;
+    }
+
+    /**
+     * 获取 开始 应用访问数
+     * @return pvStart
+     */
+    public Integer getPvStart(){
+        return this.pvStart;
+    }
+
+    /**
+     * 设置 开始 应用访问数
+     * @param pvStart
+     */
+    public void setPvStart(Integer pvStart){
+        this.pvStart = pvStart;
+    }
+
+    /**
+     * 获取 结束 应用访问数
+     * @return $pvEnd
+     */
+    public Integer getPvEnd(){
+        return this.pvEnd;
+    }
+
+    /**
+     * 设置 结束 应用访问数
+     * @param pvEnd
+     */
+    public void setPvEnd(Integer pvEnd){
+        this.pvEnd = pvEnd;
+    }
+
+    /**
+     * 获取 增加 应用访问数
+     * @return pvIncrement
+     */
+    public Integer getPvIncrement(){
+        return this.pvIncrement;
+    }
+
+    /**
+     * 设置 增加 应用访问数
+     * @param pvIncrement
+     */
+    public void setPvIncrement(Integer pvIncrement){
+        this.pvIncrement = pvIncrement;
+    }
+
+    /**
+     * 获取 应用访问数
+     * @return pvList
+     */
+    public List<Integer> getPvList(){
+        return this.pvList;
+    }
+
+    /**
+     * 设置 应用访问数
+     * @param pvList
+     */
+    public void setPvList(List<Integer> pvList){
+        this.pvList = pvList;
+    }
+
+    /**
+     * 获取 应用访问数
+     * @return pvNotList
+     */
+    public List<Integer> getPvNotList(){
+        return this.pvNotList;
+    }
+
+    /**
+     * 设置 应用访问数
+     * @param pvNotList
+     */
+    public void setPvNotList(List<Integer> pvNotList){
+        this.pvNotList = pvNotList;
+    }
+
+
+    /**
+     * 获取 开始 应用访客数
+     * @return uvStart
+     */
+    public Integer getUvStart(){
+        return this.uvStart;
+    }
+
+    /**
+     * 设置 开始 应用访客数
+     * @param uvStart
+     */
+    public void setUvStart(Integer uvStart){
+        this.uvStart = uvStart;
+    }
+
+    /**
+     * 获取 结束 应用访客数
+     * @return $uvEnd
+     */
+    public Integer getUvEnd(){
+        return this.uvEnd;
+    }
+
+    /**
+     * 设置 结束 应用访客数
+     * @param uvEnd
+     */
+    public void setUvEnd(Integer uvEnd){
+        this.uvEnd = uvEnd;
+    }
+
+    /**
+     * 获取 增加 应用访客数
+     * @return uvIncrement
+     */
+    public Integer getUvIncrement(){
+        return this.uvIncrement;
+    }
+
+    /**
+     * 设置 增加 应用访客数
+     * @param uvIncrement
+     */
+    public void setUvIncrement(Integer uvIncrement){
+        this.uvIncrement = uvIncrement;
+    }
+
+    /**
+     * 获取 应用访客数
+     * @return uvList
+     */
+    public List<Integer> getUvList(){
+        return this.uvList;
+    }
+
+    /**
+     * 设置 应用访客数
+     * @param uvList
+     */
+    public void setUvList(List<Integer> uvList){
+        this.uvList = uvList;
+    }
+
+    /**
+     * 获取 应用访客数
+     * @return uvNotList
+     */
+    public List<Integer> getUvNotList(){
+        return this.uvNotList;
+    }
+
+    /**
+     * 设置 应用访客数
+     * @param uvNotList
+     */
+    public void setUvNotList(List<Integer> uvNotList){
+        this.uvNotList = uvNotList;
+    }
+
+
+    /**
+     * 获取 操作类型
+     * @return oprList
+     */
+    public List<String> getOprList(){
+        return this.oprList;
+    }
+
+    /**
+     * 设置 操作类型
+     * @param oprList
+     */
+    public void setOprList(List<String> oprList){
+        this.oprList = oprList;
+    }
+
+    /**
+     * 获取 操作类型
+     * @return oprNotList
+     */
+    public List<String> getOprNotList(){
+        return this.oprNotList;
+    }
+
+    /**
+     * 设置 操作类型
+     * @param oprNotList
+     */
+    public void setOprNotList(List<String> oprNotList){
+        this.oprNotList = oprNotList;
+    }
+
+    /**
+     * 获取 开始 站点id
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点id
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点id
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+     * 设置  序号，主键，自增长
+     * @param id
+     */
+    public ConvergeAppsQuery id(Long id){
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 序号，主键，自增长
+     * @param idStart
+     */
+    public ConvergeAppsQuery idStart(Long idStart){
+        this.idStart = idStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 序号，主键，自增长
+     * @param idEnd
+     */
+    public ConvergeAppsQuery idEnd(Long idEnd){
+        this.idEnd = idEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 序号，主键，自增长
+     * @param idIncrement
+     */
+    public ConvergeAppsQuery idIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idList
+     */
+    public ConvergeAppsQuery idList(List<Long> idList){
+        this.idList = idList;
+        return this;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public ConvergeAppsQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
+    /**
+     * 设置  设备ID
+     * @param equipmentId
+     */
+    public ConvergeAppsQuery equipmentId(Long equipmentId){
+        setEquipmentId(equipmentId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 设备ID
+     * @param equipmentIdStart
+     */
+    public ConvergeAppsQuery equipmentIdStart(Long equipmentIdStart){
+        this.equipmentIdStart = equipmentIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 设备ID
+     * @param equipmentIdEnd
+     */
+    public ConvergeAppsQuery equipmentIdEnd(Long equipmentIdEnd){
+        this.equipmentIdEnd = equipmentIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 设备ID
+     * @param equipmentIdIncrement
+     */
+    public ConvergeAppsQuery equipmentIdIncrement(Long equipmentIdIncrement){
+        this.equipmentIdIncrement = equipmentIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 设备ID
+     * @param equipmentIdList
+     */
+    public ConvergeAppsQuery equipmentIdList(List<Long> equipmentIdList){
+        this.equipmentIdList = equipmentIdList;
+        return this;
+    }
+
+    /**
+     * 设置 设备ID
+     * @param equipmentIdNotList
+     */
+    public ConvergeAppsQuery equipmentIdNotList(List<Long> equipmentIdNotList){
+        this.equipmentIdNotList = equipmentIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 应用标识，具有唯一性
+     * @param appEname
+     */
+    public ConvergeAppsQuery appEname(String appEname){
+        setAppEname(appEname);
+        return this;
+    }
+
+    /**
+     * 设置 应用标识，具有唯一性
+     * @param appEnameList
+     */
+    public ConvergeAppsQuery appEnameList(List<String> appEnameList){
+        this.appEnameList = appEnameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 应用名称
+     * @param appName
+     */
+    public ConvergeAppsQuery appName(String appName){
+        setAppName(appName);
+        return this;
+    }
+
+    /**
+     * 设置 应用名称
+     * @param appNameList
+     */
+    public ConvergeAppsQuery appNameList(List<String> appNameList){
+        this.appNameList = appNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 应用简称
+     * @param appSimpleName
+     */
+    public ConvergeAppsQuery appSimpleName(String appSimpleName){
+        setAppSimpleName(appSimpleName);
+        return this;
+    }
+
+    /**
+     * 设置 应用简称
+     * @param appSimpleNameList
+     */
+    public ConvergeAppsQuery appSimpleNameList(List<String> appSimpleNameList){
+        this.appSimpleNameList = appSimpleNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 应用提供方
+     * @param provider
+     */
+    public ConvergeAppsQuery provider(String provider){
+        setProvider(provider);
+        return this;
+    }
+
+    /**
+     * 设置 应用提供方
+     * @param providerList
+     */
+    public ConvergeAppsQuery providerList(List<String> providerList){
+        this.providerList = providerList;
+        return this;
+    }
+
+
+    /**
+     * 设置 应用来源
+     * @param origin
+     */
+    public ConvergeAppsQuery origin(String origin){
+        setOrigin(origin);
+        return this;
+    }
+
+    /**
+     * 设置 应用来源
+     * @param originList
+     */
+    public ConvergeAppsQuery originList(List<String> originList){
+        this.originList = originList;
+        return this;
+    }
+
+    /**
+     * 设置  应用访问数
+     * @param pv
+     */
+    public ConvergeAppsQuery pv(Integer pv){
+        setPv(pv);
+        return this;
+    }
+
+    /**
+     * 设置 开始 应用访问数
+     * @param pvStart
+     */
+    public ConvergeAppsQuery pvStart(Integer pvStart){
+        this.pvStart = pvStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 应用访问数
+     * @param pvEnd
+     */
+    public ConvergeAppsQuery pvEnd(Integer pvEnd){
+        this.pvEnd = pvEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 应用访问数
+     * @param pvIncrement
+     */
+    public ConvergeAppsQuery pvIncrement(Integer pvIncrement){
+        this.pvIncrement = pvIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 应用访问数
+     * @param pvList
+     */
+    public ConvergeAppsQuery pvList(List<Integer> pvList){
+        this.pvList = pvList;
+        return this;
+    }
+
+    /**
+     * 设置 应用访问数
+     * @param pvNotList
+     */
+    public ConvergeAppsQuery pvNotList(List<Integer> pvNotList){
+        this.pvNotList = pvNotList;
+        return this;
+    }
+
+    /**
+     * 设置  应用访客数
+     * @param uv
+     */
+    public ConvergeAppsQuery uv(Integer uv){
+        setUv(uv);
+        return this;
+    }
+
+    /**
+     * 设置 开始 应用访客数
+     * @param uvStart
+     */
+    public ConvergeAppsQuery uvStart(Integer uvStart){
+        this.uvStart = uvStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 应用访客数
+     * @param uvEnd
+     */
+    public ConvergeAppsQuery uvEnd(Integer uvEnd){
+        this.uvEnd = uvEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 应用访客数
+     * @param uvIncrement
+     */
+    public ConvergeAppsQuery uvIncrement(Integer uvIncrement){
+        this.uvIncrement = uvIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 应用访客数
+     * @param uvList
+     */
+    public ConvergeAppsQuery uvList(List<Integer> uvList){
+        this.uvList = uvList;
+        return this;
+    }
+
+    /**
+     * 设置 应用访客数
+     * @param uvNotList
+     */
+    public ConvergeAppsQuery uvNotList(List<Integer> uvNotList){
+        this.uvNotList = uvNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 操作类型
+     * @param opr
+     */
+    public ConvergeAppsQuery opr(String opr){
+        setOpr(opr);
+        return this;
+    }
+
+    /**
+     * 设置 操作类型
+     * @param oprList
+     */
+    public ConvergeAppsQuery oprList(List<String> oprList){
+        this.oprList = oprList;
+        return this;
+    }
+
+    /**
+     * 设置  站点id
+     * @param siteId
+     */
+    public ConvergeAppsQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public ConvergeAppsQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public ConvergeAppsQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public ConvergeAppsQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public ConvergeAppsQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public ConvergeAppsQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
+    /**
+     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
+    public List<ConvergeAppsQuery> getOrConditionList(){
+        return this.orConditionList;
+    }
+
+    /**
+     * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
+    public void setOrConditionList(List<ConvergeAppsQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
+    public List<ConvergeAppsQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+     * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
+    public void setAndConditionList(List<ConvergeAppsQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeDeviceEntity.java

+package com.mortals.xhx.module.converge.model;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.converge.model.vo.ConvergeDeviceVo;
+import lombok.Data;
+/**
+ * 网点设备实体对象
+ *
+ * @author zxfei
+ * @date 2023-06-12
+ */
+@Data
+public class ConvergeDeviceEntity extends ConvergeDeviceVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网点ID
+     */
+    private Long branchId;
+    /**
+     * 设备名称
+     */
+    private String equipmentName;
+    /**
+     * 设备系统类型
+     */
+    private String systemName;
+    /**
+     * 设备标识，具有唯一性
+     */
+    private String logo;
+    /**
+     * 设备所属行业
+     */
+    private String industry;
+    /**
+     * 设备运行状态
+     */
+    private String isAbnormal;
+    /**
+     * 操作类型
+     */
+    private String opr;
+    /**
+     * 站点id
+     */
+    private Long siteId;
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof ConvergeDeviceEntity) {
+            ConvergeDeviceEntity tmp = (ConvergeDeviceEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+        this.branchId = -1L;
+
+        this.equipmentName = "";
+
+        this.systemName = "";
+
+        this.logo = "";
+
+        this.industry = "";
+
+        this.isAbnormal = "";
+
+        this.opr = "";
+
+        this.siteId = -1L;
+    }
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeDeviceQuery.java

+package com.mortals.xhx.module.converge.model;
+
+import java.util.List;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity;
+/**
+ * 网点设备查询对象
+ *
+ * @author zxfei
+ * @date 2023-06-12
+ */
+public class ConvergeDeviceQuery extends ConvergeDeviceEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 开始 网点ID */
+    private Long branchIdStart;
+
+    /** 结束 网点ID */
+    private Long branchIdEnd;
+
+    /** 增加 网点ID */
+    private Long branchIdIncrement;
+
+    /** 网点ID列表 */
+    private List <Long> branchIdList;
+
+    /** 网点ID排除列表 */
+    private List <Long> branchIdNotList;
+
+    /** 设备名称 */
+    private List<String> equipmentNameList;
+
+    /** 设备名称排除列表 */
+    private List <String> equipmentNameNotList;
+    /** 设备系统类型 */
+    private List<String> systemNameList;
+
+    /** 设备系统类型排除列表 */
+    private List <String> systemNameNotList;
+    /** 设备标识，具有唯一性 */
+    private List<String> logoList;
+
+    /** 设备标识，具有唯一性排除列表 */
+    private List <String> logoNotList;
+    /** 设备所属行业 */
+    private List<String> industryList;
+
+    /** 设备所属行业排除列表 */
+    private List <String> industryNotList;
+    /** 设备运行状态 */
+    private List<String> isAbnormalList;
+
+    /** 设备运行状态排除列表 */
+    private List <String> isAbnormalNotList;
+    /** 操作类型 */
+    private List<String> oprList;
+
+    /** 操作类型排除列表 */
+    private List <String> oprNotList;
+    /** 开始 站点id */
+    private Long siteIdStart;
+
+    /** 结束 站点id */
+    private Long siteIdEnd;
+
+    /** 增加 站点id */
+    private Long siteIdIncrement;
+
+    /** 站点id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<ConvergeDeviceQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<ConvergeDeviceQuery> andConditionList;
+
+    public ConvergeDeviceQuery(){}
+
+    /**
+     * 获取 开始 序号，主键，自增长
+     * @return idStart
+     */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+     * 设置 开始 序号，主键，自增长
+     * @param idStart
+     */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+     * 获取 结束 序号，主键，自增长
+     * @return $idEnd
+     */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+     * 设置 结束 序号，主键，自增长
+     * @param idEnd
+     */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+     * 获取 增加 序号，主键，自增长
+     * @return idIncrement
+     */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+     * 设置 增加 序号，主键，自增长
+     * @param idIncrement
+     */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+     * 获取 序号，主键，自增长
+     * @return idList
+     */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idList
+     */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+     * 获取 开始 网点ID
+     * @return branchIdStart
+     */
+    public Long getBranchIdStart(){
+        return this.branchIdStart;
+    }
+
+    /**
+     * 设置 开始 网点ID
+     * @param branchIdStart
+     */
+    public void setBranchIdStart(Long branchIdStart){
+        this.branchIdStart = branchIdStart;
+    }
+
+    /**
+     * 获取 结束 网点ID
+     * @return $branchIdEnd
+     */
+    public Long getBranchIdEnd(){
+        return this.branchIdEnd;
+    }
+
+    /**
+     * 设置 结束 网点ID
+     * @param branchIdEnd
+     */
+    public void setBranchIdEnd(Long branchIdEnd){
+        this.branchIdEnd = branchIdEnd;
+    }
+
+    /**
+     * 获取 增加 网点ID
+     * @return branchIdIncrement
+     */
+    public Long getBranchIdIncrement(){
+        return this.branchIdIncrement;
+    }
+
+    /**
+     * 设置 增加 网点ID
+     * @param branchIdIncrement
+     */
+    public void setBranchIdIncrement(Long branchIdIncrement){
+        this.branchIdIncrement = branchIdIncrement;
+    }
+
+    /**
+     * 获取 网点ID
+     * @return branchIdList
+     */
+    public List<Long> getBranchIdList(){
+        return this.branchIdList;
+    }
+
+    /**
+     * 设置 网点ID
+     * @param branchIdList
+     */
+    public void setBranchIdList(List<Long> branchIdList){
+        this.branchIdList = branchIdList;
+    }
+
+    /**
+     * 获取 网点ID
+     * @return branchIdNotList
+     */
+    public List<Long> getBranchIdNotList(){
+        return this.branchIdNotList;
+    }
+
+    /**
+     * 设置 网点ID
+     * @param branchIdNotList
+     */
+    public void setBranchIdNotList(List<Long> branchIdNotList){
+        this.branchIdNotList = branchIdNotList;
+    }
+
+
+    /**
+     * 获取 设备名称
+     * @return equipmentNameList
+     */
+    public List<String> getEquipmentNameList(){
+        return this.equipmentNameList;
+    }
+
+    /**
+     * 设置 设备名称
+     * @param equipmentNameList
+     */
+    public void setEquipmentNameList(List<String> equipmentNameList){
+        this.equipmentNameList = equipmentNameList;
+    }
+
+    /**
+     * 获取 设备名称
+     * @return equipmentNameNotList
+     */
+    public List<String> getEquipmentNameNotList(){
+        return this.equipmentNameNotList;
+    }
+
+    /**
+     * 设置 设备名称
+     * @param equipmentNameNotList
+     */
+    public void setEquipmentNameNotList(List<String> equipmentNameNotList){
+        this.equipmentNameNotList = equipmentNameNotList;
+    }
+
+    /**
+     * 获取 设备系统类型
+     * @return systemNameList
+     */
+    public List<String> getSystemNameList(){
+        return this.systemNameList;
+    }
+
+    /**
+     * 设置 设备系统类型
+     * @param systemNameList
+     */
+    public void setSystemNameList(List<String> systemNameList){
+        this.systemNameList = systemNameList;
+    }
+
+    /**
+     * 获取 设备系统类型
+     * @return systemNameNotList
+     */
+    public List<String> getSystemNameNotList(){
+        return this.systemNameNotList;
+    }
+
+    /**
+     * 设置 设备系统类型
+     * @param systemNameNotList
+     */
+    public void setSystemNameNotList(List<String> systemNameNotList){
+        this.systemNameNotList = systemNameNotList;
+    }
+
+    /**
+     * 获取 设备标识，具有唯一性
+     * @return logoList
+     */
+    public List<String> getLogoList(){
+        return this.logoList;
+    }
+
+    /**
+     * 设置 设备标识，具有唯一性
+     * @param logoList
+     */
+    public void setLogoList(List<String> logoList){
+        this.logoList = logoList;
+    }
+
+    /**
+     * 获取 设备标识，具有唯一性
+     * @return logoNotList
+     */
+    public List<String> getLogoNotList(){
+        return this.logoNotList;
+    }
+
+    /**
+     * 设置 设备标识，具有唯一性
+     * @param logoNotList
+     */
+    public void setLogoNotList(List<String> logoNotList){
+        this.logoNotList = logoNotList;
+    }
+
+    /**
+     * 获取 设备所属行业
+     * @return industryList
+     */
+    public List<String> getIndustryList(){
+        return this.industryList;
+    }
+
+    /**
+     * 设置 设备所属行业
+     * @param industryList
+     */
+    public void setIndustryList(List<String> industryList){
+        this.industryList = industryList;
+    }
+
+    /**
+     * 获取 设备所属行业
+     * @return industryNotList
+     */
+    public List<String> getIndustryNotList(){
+        return this.industryNotList;
+    }
+
+    /**
+     * 设置 设备所属行业
+     * @param industryNotList
+     */
+    public void setIndustryNotList(List<String> industryNotList){
+        this.industryNotList = industryNotList;
+    }
+
+    /**
+     * 获取 设备运行状态
+     * @return isAbnormalList
+     */
+    public List<String> getIsAbnormalList(){
+        return this.isAbnormalList;
+    }
+
+    /**
+     * 设置 设备运行状态
+     * @param isAbnormalList
+     */
+    public void setIsAbnormalList(List<String> isAbnormalList){
+        this.isAbnormalList = isAbnormalList;
+    }
+
+    /**
+     * 获取 设备运行状态
+     * @return isAbnormalNotList
+     */
+    public List<String> getIsAbnormalNotList(){
+        return this.isAbnormalNotList;
+    }
+
+    /**
+     * 设置 设备运行状态
+     * @param isAbnormalNotList
+     */
+    public void setIsAbnormalNotList(List<String> isAbnormalNotList){
+        this.isAbnormalNotList = isAbnormalNotList;
+    }
+
+    /**
+     * 获取 操作类型
+     * @return oprList
+     */
+    public List<String> getOprList(){
+        return this.oprList;
+    }
+
+    /**
+     * 设置 操作类型
+     * @param oprList
+     */
+    public void setOprList(List<String> oprList){
+        this.oprList = oprList;
+    }
+
+    /**
+     * 获取 操作类型
+     * @return oprNotList
+     */
+    public List<String> getOprNotList(){
+        return this.oprNotList;
+    }
+
+    /**
+     * 设置 操作类型
+     * @param oprNotList
+     */
+    public void setOprNotList(List<String> oprNotList){
+        this.oprNotList = oprNotList;
+    }
+
+    /**
+     * 获取 开始 站点id
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点id
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点id
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+     * 设置  序号，主键，自增长
+     * @param id
+     */
+    public ConvergeDeviceQuery id(Long id){
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 序号，主键，自增长
+     * @param idStart
+     */
+    public ConvergeDeviceQuery idStart(Long idStart){
+        this.idStart = idStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 序号，主键，自增长
+     * @param idEnd
+     */
+    public ConvergeDeviceQuery idEnd(Long idEnd){
+        this.idEnd = idEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 序号，主键，自增长
+     * @param idIncrement
+     */
+    public ConvergeDeviceQuery idIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idList
+     */
+    public ConvergeDeviceQuery idList(List<Long> idList){
+        this.idList = idList;
+        return this;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public ConvergeDeviceQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
+    /**
+     * 设置  网点ID
+     * @param branchId
+     */
+    public ConvergeDeviceQuery branchId(Long branchId){
+        setBranchId(branchId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 网点ID
+     * @param branchIdStart
+     */
+    public ConvergeDeviceQuery branchIdStart(Long branchIdStart){
+        this.branchIdStart = branchIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 网点ID
+     * @param branchIdEnd
+     */
+    public ConvergeDeviceQuery branchIdEnd(Long branchIdEnd){
+        this.branchIdEnd = branchIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 网点ID
+     * @param branchIdIncrement
+     */
+    public ConvergeDeviceQuery branchIdIncrement(Long branchIdIncrement){
+        this.branchIdIncrement = branchIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 网点ID
+     * @param branchIdList
+     */
+    public ConvergeDeviceQuery branchIdList(List<Long> branchIdList){
+        this.branchIdList = branchIdList;
+        return this;
+    }
+
+    /**
+     * 设置 网点ID
+     * @param branchIdNotList
+     */
+    public ConvergeDeviceQuery branchIdNotList(List<Long> branchIdNotList){
+        this.branchIdNotList = branchIdNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 设备名称
+     * @param equipmentName
+     */
+    public ConvergeDeviceQuery equipmentName(String equipmentName){
+        setEquipmentName(equipmentName);
+        return this;
+    }
+
+    /**
+     * 设置 设备名称
+     * @param equipmentNameList
+     */
+    public ConvergeDeviceQuery equipmentNameList(List<String> equipmentNameList){
+        this.equipmentNameList = equipmentNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 设备系统类型
+     * @param systemName
+     */
+    public ConvergeDeviceQuery systemName(String systemName){
+        setSystemName(systemName);
+        return this;
+    }
+
+    /**
+     * 设置 设备系统类型
+     * @param systemNameList
+     */
+    public ConvergeDeviceQuery systemNameList(List<String> systemNameList){
+        this.systemNameList = systemNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 设备标识，具有唯一性
+     * @param logo
+     */
+    public ConvergeDeviceQuery logo(String logo){
+        setLogo(logo);
+        return this;
+    }
+
+    /**
+     * 设置 设备标识，具有唯一性
+     * @param logoList
+     */
+    public ConvergeDeviceQuery logoList(List<String> logoList){
+        this.logoList = logoList;
+        return this;
+    }
+
+
+    /**
+     * 设置 设备所属行业
+     * @param industry
+     */
+    public ConvergeDeviceQuery industry(String industry){
+        setIndustry(industry);
+        return this;
+    }
+
+    /**
+     * 设置 设备所属行业
+     * @param industryList
+     */
+    public ConvergeDeviceQuery industryList(List<String> industryList){
+        this.industryList = industryList;
+        return this;
+    }
+
+
+    /**
+     * 设置 设备运行状态
+     * @param isAbnormal
+     */
+    public ConvergeDeviceQuery isAbnormal(String isAbnormal){
+        setIsAbnormal(isAbnormal);
+        return this;
+    }
+
+    /**
+     * 设置 设备运行状态
+     * @param isAbnormalList
+     */
+    public ConvergeDeviceQuery isAbnormalList(List<String> isAbnormalList){
+        this.isAbnormalList = isAbnormalList;
+        return this;
+    }
+
+
+    /**
+     * 设置 操作类型
+     * @param opr
+     */
+    public ConvergeDeviceQuery opr(String opr){
+        setOpr(opr);
+        return this;
+    }
+
+    /**
+     * 设置 操作类型
+     * @param oprList
+     */
+    public ConvergeDeviceQuery oprList(List<String> oprList){
+        this.oprList = oprList;
+        return this;
+    }
+
+    /**
+     * 设置  站点id
+     * @param siteId
+     */
+    public ConvergeDeviceQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public ConvergeDeviceQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public ConvergeDeviceQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public ConvergeDeviceQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public ConvergeDeviceQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public ConvergeDeviceQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
+    /**
+     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
+    public List<ConvergeDeviceQuery> getOrConditionList(){
+        return this.orConditionList;
+    }
+
+    /**
+     * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
+    public void setOrConditionList(List<ConvergeDeviceQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
+    public List<ConvergeDeviceQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+     * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
+    public void setAndConditionList(List<ConvergeDeviceQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeSiteEntity.java

+package com.mortals.xhx.module.converge.model;
+import java.util.List;
+import java.util.ArrayList;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mortals.framework.annotation.Excel;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.converge.model.vo.ConvergeSiteVo;
+import lombok.Data;
+/**
+ * 网点信息实体对象
+ *
+ * @author zxfei
+ * @date 2023-06-12
+ */
+@Data
+public class ConvergeSiteEntity extends ConvergeSiteVo {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 网点名称
+     */
+    private String branchName;
+    /**
+     * 网点标识
+     */
+    private String branchLogo;
+    /**
+     * 网点服务状态，正常Y异常N
+     */
+    private String status;
+    /**
+     * 网点服务时间
+     */
+    private String serverTime;
+    /**
+     * 网点咨询电话
+     */
+    private String consultPhone;
+    /**
+     * 网点类型
+     */
+    private String branchStyle;
+    /**
+     * 网点地址
+     */
+    private String address;
+    /**
+     * 操作类型
+     */
+    private String opr;
+    /**
+     * 站点id
+     */
+    private Long siteId;
+    @Override
+    public int hashCode() {
+        return this.getId().hashCode();
+    }
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == null) return false;
+        if (obj instanceof ConvergeSiteEntity) {
+            ConvergeSiteEntity tmp = (ConvergeSiteEntity) obj;
+            if (this.getId() == tmp.getId()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public void initAttrValue(){
+
+        this.branchName = "";
+
+        this.branchLogo = "";
+
+        this.status = "";
+
+        this.serverTime = "";
+
+        this.consultPhone = "";
+
+        this.branchStyle = "";
+
+        this.address = "";
+
+        this.opr = "";
+
+        this.siteId = -1L;
+    }
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/ConvergeSiteQuery.java

+package com.mortals.xhx.module.converge.model;
+
+import java.util.List;
+import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
+/**
+ * 网点信息查询对象
+ *
+ * @author zxfei
+ * @date 2023-06-12
+ */
+public class ConvergeSiteQuery extends ConvergeSiteEntity {
+    /** 开始 序号，主键，自增长 */
+    private Long idStart;
+
+    /** 结束 序号，主键，自增长 */
+    private Long idEnd;
+
+    /** 增加 序号，主键，自增长 */
+    private Long idIncrement;
+
+    /** 序号，主键，自增长列表 */
+    private List <Long> idList;
+
+    /** 序号，主键，自增长排除列表 */
+    private List <Long> idNotList;
+
+    /** 网点名称 */
+    private List<String> branchNameList;
+
+    /** 网点名称排除列表 */
+    private List <String> branchNameNotList;
+    /** 网点标识 */
+    private List<String> branchLogoList;
+
+    /** 网点标识排除列表 */
+    private List <String> branchLogoNotList;
+    /** 网点服务状态，正常Y异常N */
+    private List<String> statusList;
+
+    /** 网点服务状态，正常Y异常N排除列表 */
+    private List <String> statusNotList;
+    /** 网点服务时间 */
+    private List<String> serverTimeList;
+
+    /** 网点服务时间排除列表 */
+    private List <String> serverTimeNotList;
+    /** 网点咨询电话 */
+    private List<String> consultPhoneList;
+
+    /** 网点咨询电话排除列表 */
+    private List <String> consultPhoneNotList;
+    /** 网点类型 */
+    private List<String> branchStyleList;
+
+    /** 网点类型排除列表 */
+    private List <String> branchStyleNotList;
+    /** 网点地址 */
+    private List<String> addressList;
+
+    /** 网点地址排除列表 */
+    private List <String> addressNotList;
+    /** 操作类型 */
+    private List<String> oprList;
+
+    /** 操作类型排除列表 */
+    private List <String> oprNotList;
+    /** 开始 站点id */
+    private Long siteIdStart;
+
+    /** 结束 站点id */
+    private Long siteIdEnd;
+
+    /** 增加 站点id */
+    private Long siteIdIncrement;
+
+    /** 站点id列表 */
+    private List <Long> siteIdList;
+
+    /** 站点id排除列表 */
+    private List <Long> siteIdNotList;
+
+    /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
+    private List<ConvergeSiteQuery> orConditionList;
+
+    /** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
+    private List<ConvergeSiteQuery> andConditionList;
+
+    public ConvergeSiteQuery(){}
+
+    /**
+     * 获取 开始 序号，主键，自增长
+     * @return idStart
+     */
+    public Long getIdStart(){
+        return this.idStart;
+    }
+
+    /**
+     * 设置 开始 序号，主键，自增长
+     * @param idStart
+     */
+    public void setIdStart(Long idStart){
+        this.idStart = idStart;
+    }
+
+    /**
+     * 获取 结束 序号，主键，自增长
+     * @return $idEnd
+     */
+    public Long getIdEnd(){
+        return this.idEnd;
+    }
+
+    /**
+     * 设置 结束 序号，主键，自增长
+     * @param idEnd
+     */
+    public void setIdEnd(Long idEnd){
+        this.idEnd = idEnd;
+    }
+
+    /**
+     * 获取 增加 序号，主键，自增长
+     * @return idIncrement
+     */
+    public Long getIdIncrement(){
+        return this.idIncrement;
+    }
+
+    /**
+     * 设置 增加 序号，主键，自增长
+     * @param idIncrement
+     */
+    public void setIdIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+    }
+
+    /**
+     * 获取 序号，主键，自增长
+     * @return idList
+     */
+    public List<Long> getIdList(){
+        return this.idList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idList
+     */
+    public void setIdList(List<Long> idList){
+        this.idList = idList;
+    }
+
+    /**
+     * 获取 序号，主键，自增长
+     * @return idNotList
+     */
+    public List<Long> getIdNotList(){
+        return this.idNotList;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public void setIdNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+    }
+
+
+    /**
+     * 获取 网点名称
+     * @return branchNameList
+     */
+    public List<String> getBranchNameList(){
+        return this.branchNameList;
+    }
+
+    /**
+     * 设置 网点名称
+     * @param branchNameList
+     */
+    public void setBranchNameList(List<String> branchNameList){
+        this.branchNameList = branchNameList;
+    }
+
+    /**
+     * 获取 网点名称
+     * @return branchNameNotList
+     */
+    public List<String> getBranchNameNotList(){
+        return this.branchNameNotList;
+    }
+
+    /**
+     * 设置 网点名称
+     * @param branchNameNotList
+     */
+    public void setBranchNameNotList(List<String> branchNameNotList){
+        this.branchNameNotList = branchNameNotList;
+    }
+
+    /**
+     * 获取 网点标识
+     * @return branchLogoList
+     */
+    public List<String> getBranchLogoList(){
+        return this.branchLogoList;
+    }
+
+    /**
+     * 设置 网点标识
+     * @param branchLogoList
+     */
+    public void setBranchLogoList(List<String> branchLogoList){
+        this.branchLogoList = branchLogoList;
+    }
+
+    /**
+     * 获取 网点标识
+     * @return branchLogoNotList
+     */
+    public List<String> getBranchLogoNotList(){
+        return this.branchLogoNotList;
+    }
+
+    /**
+     * 设置 网点标识
+     * @param branchLogoNotList
+     */
+    public void setBranchLogoNotList(List<String> branchLogoNotList){
+        this.branchLogoNotList = branchLogoNotList;
+    }
+
+    /**
+     * 获取 网点服务状态，正常Y异常N
+     * @return statusList
+     */
+    public List<String> getStatusList(){
+        return this.statusList;
+    }
+
+    /**
+     * 设置 网点服务状态，正常Y异常N
+     * @param statusList
+     */
+    public void setStatusList(List<String> statusList){
+        this.statusList = statusList;
+    }
+
+    /**
+     * 获取 网点服务状态，正常Y异常N
+     * @return statusNotList
+     */
+    public List<String> getStatusNotList(){
+        return this.statusNotList;
+    }
+
+    /**
+     * 设置 网点服务状态，正常Y异常N
+     * @param statusNotList
+     */
+    public void setStatusNotList(List<String> statusNotList){
+        this.statusNotList = statusNotList;
+    }
+
+    /**
+     * 获取 网点服务时间
+     * @return serverTimeList
+     */
+    public List<String> getServerTimeList(){
+        return this.serverTimeList;
+    }
+
+    /**
+     * 设置 网点服务时间
+     * @param serverTimeList
+     */
+    public void setServerTimeList(List<String> serverTimeList){
+        this.serverTimeList = serverTimeList;
+    }
+
+    /**
+     * 获取 网点服务时间
+     * @return serverTimeNotList
+     */
+    public List<String> getServerTimeNotList(){
+        return this.serverTimeNotList;
+    }
+
+    /**
+     * 设置 网点服务时间
+     * @param serverTimeNotList
+     */
+    public void setServerTimeNotList(List<String> serverTimeNotList){
+        this.serverTimeNotList = serverTimeNotList;
+    }
+
+    /**
+     * 获取 网点咨询电话
+     * @return consultPhoneList
+     */
+    public List<String> getConsultPhoneList(){
+        return this.consultPhoneList;
+    }
+
+    /**
+     * 设置 网点咨询电话
+     * @param consultPhoneList
+     */
+    public void setConsultPhoneList(List<String> consultPhoneList){
+        this.consultPhoneList = consultPhoneList;
+    }
+
+    /**
+     * 获取 网点咨询电话
+     * @return consultPhoneNotList
+     */
+    public List<String> getConsultPhoneNotList(){
+        return this.consultPhoneNotList;
+    }
+
+    /**
+     * 设置 网点咨询电话
+     * @param consultPhoneNotList
+     */
+    public void setConsultPhoneNotList(List<String> consultPhoneNotList){
+        this.consultPhoneNotList = consultPhoneNotList;
+    }
+
+    /**
+     * 获取 网点类型
+     * @return branchStyleList
+     */
+    public List<String> getBranchStyleList(){
+        return this.branchStyleList;
+    }
+
+    /**
+     * 设置 网点类型
+     * @param branchStyleList
+     */
+    public void setBranchStyleList(List<String> branchStyleList){
+        this.branchStyleList = branchStyleList;
+    }
+
+    /**
+     * 获取 网点类型
+     * @return branchStyleNotList
+     */
+    public List<String> getBranchStyleNotList(){
+        return this.branchStyleNotList;
+    }
+
+    /**
+     * 设置 网点类型
+     * @param branchStyleNotList
+     */
+    public void setBranchStyleNotList(List<String> branchStyleNotList){
+        this.branchStyleNotList = branchStyleNotList;
+    }
+
+    /**
+     * 获取 网点地址
+     * @return addressList
+     */
+    public List<String> getAddressList(){
+        return this.addressList;
+    }
+
+    /**
+     * 设置 网点地址
+     * @param addressList
+     */
+    public void setAddressList(List<String> addressList){
+        this.addressList = addressList;
+    }
+
+    /**
+     * 获取 网点地址
+     * @return addressNotList
+     */
+    public List<String> getAddressNotList(){
+        return this.addressNotList;
+    }
+
+    /**
+     * 设置 网点地址
+     * @param addressNotList
+     */
+    public void setAddressNotList(List<String> addressNotList){
+        this.addressNotList = addressNotList;
+    }
+
+    /**
+     * 获取 操作类型
+     * @return oprList
+     */
+    public List<String> getOprList(){
+        return this.oprList;
+    }
+
+    /**
+     * 设置 操作类型
+     * @param oprList
+     */
+    public void setOprList(List<String> oprList){
+        this.oprList = oprList;
+    }
+
+    /**
+     * 获取 操作类型
+     * @return oprNotList
+     */
+    public List<String> getOprNotList(){
+        return this.oprNotList;
+    }
+
+    /**
+     * 设置 操作类型
+     * @param oprNotList
+     */
+    public void setOprNotList(List<String> oprNotList){
+        this.oprNotList = oprNotList;
+    }
+
+    /**
+     * 获取 开始 站点id
+     * @return siteIdStart
+     */
+    public Long getSiteIdStart(){
+        return this.siteIdStart;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public void setSiteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+    }
+
+    /**
+     * 获取 结束 站点id
+     * @return $siteIdEnd
+     */
+    public Long getSiteIdEnd(){
+        return this.siteIdEnd;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public void setSiteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+    }
+
+    /**
+     * 获取 增加 站点id
+     * @return siteIdIncrement
+     */
+    public Long getSiteIdIncrement(){
+        return this.siteIdIncrement;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public void setSiteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdList
+     */
+    public List<Long> getSiteIdList(){
+        return this.siteIdList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public void setSiteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+    }
+
+    /**
+     * 获取 站点id
+     * @return siteIdNotList
+     */
+    public List<Long> getSiteIdNotList(){
+        return this.siteIdNotList;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public void setSiteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+    }
+
+
+    /**
+     * 设置  序号，主键，自增长
+     * @param id
+     */
+    public ConvergeSiteQuery id(Long id){
+        setId(id);
+        return this;
+    }
+
+    /**
+     * 设置 开始 序号，主键，自增长
+     * @param idStart
+     */
+    public ConvergeSiteQuery idStart(Long idStart){
+        this.idStart = idStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 序号，主键，自增长
+     * @param idEnd
+     */
+    public ConvergeSiteQuery idEnd(Long idEnd){
+        this.idEnd = idEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 序号，主键，自增长
+     * @param idIncrement
+     */
+    public ConvergeSiteQuery idIncrement(Long idIncrement){
+        this.idIncrement = idIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idList
+     */
+    public ConvergeSiteQuery idList(List<Long> idList){
+        this.idList = idList;
+        return this;
+    }
+
+    /**
+     * 设置 序号，主键，自增长
+     * @param idNotList
+     */
+    public ConvergeSiteQuery idNotList(List<Long> idNotList){
+        this.idNotList = idNotList;
+        return this;
+    }
+
+
+    /**
+     * 设置 网点名称
+     * @param branchName
+     */
+    public ConvergeSiteQuery branchName(String branchName){
+        setBranchName(branchName);
+        return this;
+    }
+
+    /**
+     * 设置 网点名称
+     * @param branchNameList
+     */
+    public ConvergeSiteQuery branchNameList(List<String> branchNameList){
+        this.branchNameList = branchNameList;
+        return this;
+    }
+
+
+    /**
+     * 设置 网点标识
+     * @param branchLogo
+     */
+    public ConvergeSiteQuery branchLogo(String branchLogo){
+        setBranchLogo(branchLogo);
+        return this;
+    }
+
+    /**
+     * 设置 网点标识
+     * @param branchLogoList
+     */
+    public ConvergeSiteQuery branchLogoList(List<String> branchLogoList){
+        this.branchLogoList = branchLogoList;
+        return this;
+    }
+
+
+    /**
+     * 设置 网点服务状态，正常Y异常N
+     * @param status
+     */
+    public ConvergeSiteQuery status(String status){
+        setStatus(status);
+        return this;
+    }
+
+    /**
+     * 设置 网点服务状态，正常Y异常N
+     * @param statusList
+     */
+    public ConvergeSiteQuery statusList(List<String> statusList){
+        this.statusList = statusList;
+        return this;
+    }
+
+
+    /**
+     * 设置 网点服务时间
+     * @param serverTime
+     */
+    public ConvergeSiteQuery serverTime(String serverTime){
+        setServerTime(serverTime);
+        return this;
+    }
+
+    /**
+     * 设置 网点服务时间
+     * @param serverTimeList
+     */
+    public ConvergeSiteQuery serverTimeList(List<String> serverTimeList){
+        this.serverTimeList = serverTimeList;
+        return this;
+    }
+
+
+    /**
+     * 设置 网点咨询电话
+     * @param consultPhone
+     */
+    public ConvergeSiteQuery consultPhone(String consultPhone){
+        setConsultPhone(consultPhone);
+        return this;
+    }
+
+    /**
+     * 设置 网点咨询电话
+     * @param consultPhoneList
+     */
+    public ConvergeSiteQuery consultPhoneList(List<String> consultPhoneList){
+        this.consultPhoneList = consultPhoneList;
+        return this;
+    }
+
+
+    /**
+     * 设置 网点类型
+     * @param branchStyle
+     */
+    public ConvergeSiteQuery branchStyle(String branchStyle){
+        setBranchStyle(branchStyle);
+        return this;
+    }
+
+    /**
+     * 设置 网点类型
+     * @param branchStyleList
+     */
+    public ConvergeSiteQuery branchStyleList(List<String> branchStyleList){
+        this.branchStyleList = branchStyleList;
+        return this;
+    }
+
+
+    /**
+     * 设置 网点地址
+     * @param address
+     */
+    public ConvergeSiteQuery address(String address){
+        setAddress(address);
+        return this;
+    }
+
+    /**
+     * 设置 网点地址
+     * @param addressList
+     */
+    public ConvergeSiteQuery addressList(List<String> addressList){
+        this.addressList = addressList;
+        return this;
+    }
+
+
+    /**
+     * 设置 操作类型
+     * @param opr
+     */
+    public ConvergeSiteQuery opr(String opr){
+        setOpr(opr);
+        return this;
+    }
+
+    /**
+     * 设置 操作类型
+     * @param oprList
+     */
+    public ConvergeSiteQuery oprList(List<String> oprList){
+        this.oprList = oprList;
+        return this;
+    }
+
+    /**
+     * 设置  站点id
+     * @param siteId
+     */
+    public ConvergeSiteQuery siteId(Long siteId){
+        setSiteId(siteId);
+        return this;
+    }
+
+    /**
+     * 设置 开始 站点id
+     * @param siteIdStart
+     */
+    public ConvergeSiteQuery siteIdStart(Long siteIdStart){
+        this.siteIdStart = siteIdStart;
+        return this;
+    }
+
+    /**
+     * 设置 结束 站点id
+     * @param siteIdEnd
+     */
+    public ConvergeSiteQuery siteIdEnd(Long siteIdEnd){
+        this.siteIdEnd = siteIdEnd;
+        return this;
+    }
+
+    /**
+     * 设置 增加 站点id
+     * @param siteIdIncrement
+     */
+    public ConvergeSiteQuery siteIdIncrement(Long siteIdIncrement){
+        this.siteIdIncrement = siteIdIncrement;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdList
+     */
+    public ConvergeSiteQuery siteIdList(List<Long> siteIdList){
+        this.siteIdList = siteIdList;
+        return this;
+    }
+
+    /**
+     * 设置 站点id
+     * @param siteIdNotList
+     */
+    public ConvergeSiteQuery siteIdNotList(List<Long> siteIdNotList){
+        this.siteIdNotList = siteIdNotList;
+        return this;
+    }
+
+    /**
+     * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @return orConditionList
+     */
+    public List<ConvergeSiteQuery> getOrConditionList(){
+        return this.orConditionList;
+    }
+
+    /**
+     * 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
+     * @param orConditionList
+     */
+    public void setOrConditionList(List<ConvergeSiteQuery> orConditionList){
+        this.orConditionList = orConditionList;
+    }
+
+    /**
+     * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @return andConditionList
+     */
+    public List<ConvergeSiteQuery> getAndConditionList(){
+        return this.andConditionList;
+    }
+
+    /**
+     * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
+     * @param andConditionList
+     */
+    public void setAndConditionList(List<ConvergeSiteQuery> andConditionList){
+        this.andConditionList = andConditionList;
+    }
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/AppVO.java

+package com.mortals.xhx.module.converge.model.vo;
+
+import lombok.Data;
+
+@Data
+public class AppVO {
+    /**
+     * 应用标识，具有唯一性
+     */
+    private String appEname;
+    /**
+     * 应用名称
+     */
+    private String appName;
+    /**
+     * 应用简称
+     */
+    private String appSimpleName;
+    /**
+     * 应用提供方
+     */
+    private String provider;
+    /**
+     * 应用来源
+     */
+    private String origin;
+    /**
+     * 应用访问数
+     */
+    private Integer pv;
+    /**
+     * 应用访客数
+     */
+    private Integer uv;
+    /**
+     * 操作类型
+     */
+    private String opr;
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/BranchVO.java

+package com.mortals.xhx.module.converge.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 网点信息
+ */
+@Data
+public class BranchVO {
+    /**
+     * 网点名称
+     */
+    private String branchName;
+    /**
+     * 网点标识
+     */
+    private String branchLogo;
+    /**
+     * 网点服务状态，正常Y异常N
+     */
+    private String status;
+    /**
+     * 网点服务时间
+     */
+    private String serverTime;
+    /**
+     * 网点咨询电话
+     */
+    private String consultPhone;
+    /**
+     * 网点类型
+     */
+    private String branchStyle;
+    /**
+     * 网点地址
+     */
+    private String address;
+    /**
+     * 操作类型
+     */
+    private String opr;
+
+    private List<EquipmentVO> equipments;
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/ConvergeAppsVo.java

+package com.mortals.xhx.module.converge.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 设备应用视图对象
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@Data
+public class ConvergeAppsVo extends BaseEntityLong {
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/ConvergeDeviceVo.java

+package com.mortals.xhx.module.converge.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 网点设备视图对象
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@Data
+public class ConvergeDeviceVo extends BaseEntityLong {
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/ConvergeSiteVo.java

+package com.mortals.xhx.module.converge.model.vo;
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity;
+import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+import com.mortals.framework.annotation.Excel;
+import java.math.BigDecimal;
+import java.util.Date;
+/**
+* 网点信息视图对象
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@Data
+public class ConvergeSiteVo extends BaseEntityLong {
+    /** 设备集合 */
+    private List<ConvergeDeviceEntity> equipments;
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/model/vo/EquipmentVO.java

+package com.mortals.xhx.module.converge.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 设备信息
+ */
+@Data
+public class EquipmentVO {
+    /**
+     * 设备名称
+     */
+    private String equipmentName;
+    /**
+     * 设备系统类型
+     */
+    private String systemName;
+    /**
+     * 设备标识，具有唯一性
+     */
+    private String logo;
+    /**
+     * 设备所属行业
+     */
+    private String industry;
+    /**
+     * 设备运行状态
+     */
+    private String isAbnormal;
+    /**
+     * 操作类型
+     */
+    private String opr;
+    /** 应用统计集合 */
+    private List<AppVO> appStats;
+}

sst-manager/src/main/java/com/mortals/xhx/module/converge/service/ConvergeAppsService.java

+package com.mortals.xhx.module.converge.service;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
+import com.mortals.xhx.module.converge.dao.ConvergeAppsDao;
+/**
+* ConvergeAppsService
+*
+* 设备应用 service接口
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+public interface ConvergeAppsService extends ICRUDService<ConvergeAppsEntity,Long>{
+
+    ConvergeAppsDao getDao();
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/service/ConvergeDeviceService.java

+package com.mortals.xhx.module.converge.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity;
+import com.mortals.xhx.module.converge.dao.ConvergeDeviceDao;
+/**
+* ConvergeDeviceService
+*
+* 网点设备 service接口
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+public interface ConvergeDeviceService extends ICRUDService<ConvergeDeviceEntity,Long>{
+
+    ConvergeDeviceDao getDao();
+
+    /**
+     * 天府通办数据汇聚
+     * @throws AppException
+     */
+    void  doConvergeDevice() throws AppException;
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/service/ConvergeSiteService.java

+package com.mortals.xhx.module.converge.service;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ICRUDService;
+import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
+import com.mortals.xhx.module.converge.dao.ConvergeSiteDao;
+import com.mortals.xhx.module.converge.model.vo.BranchVO;
+
+import java.util.List;
+
+/**
+* ConvergeSiteService
+*
+* 网点信息 service接口
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+public interface ConvergeSiteService extends ICRUDService<ConvergeSiteEntity,Long>{
+
+    ConvergeSiteDao getDao();
+
+    /**
+     * 天府通办数据汇聚
+     * @throws AppException
+     */
+    void doConvergeSite() throws AppException;
+
+    /**
+     * 获取汇聚后的数据
+     * @return
+     * @throws AppException
+     */
+    List<BranchVO> getConvergeData() throws AppException;
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeAppsServiceImpl.java

+package com.mortals.xhx.module.converge.service.impl;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.converge.dao.ConvergeAppsDao;
+import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
+import com.mortals.xhx.module.converge.service.ConvergeAppsService;
+import lombok.extern.slf4j.Slf4j;
+/**
+* ConvergeAppsService
+* 设备应用 service实现
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@Service("convergeAppsService")
+@Slf4j
+public class ConvergeAppsServiceImpl extends AbstractCRUDServiceImpl<ConvergeAppsDao, ConvergeAppsEntity, Long> implements ConvergeAppsService {
+    
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeDeviceServiceImpl.java

+package com.mortals.xhx.module.converge.service.impl;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.device.DevicePdu;
+import com.mortals.xhx.feign.device.IDeviceFeign;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceQuery;
+import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
+import com.mortals.xhx.module.converge.model.ConvergeSiteQuery;
+import com.mortals.xhx.module.converge.service.ConvergeSiteService;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.converge.dao.ConvergeDeviceDao;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity;
+import com.mortals.xhx.module.converge.service.ConvergeDeviceService;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+* ConvergeDeviceService
+* 网点设备 service实现
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@Service("convergeDeviceService")
+@Slf4j
+public class ConvergeDeviceServiceImpl extends AbstractCRUDServiceImpl<ConvergeDeviceDao, ConvergeDeviceEntity, Long> implements ConvergeDeviceService {
+
+    @Autowired
+    private IDeviceFeign deviceFeign;
+    @Autowired
+    private ConvergeSiteService convergeSiteService;
+
+    @Override
+    public void doConvergeDevice() throws AppException {
+        DevicePdu devicePdu = new DevicePdu();
+        devicePdu.setSize(-1);
+        devicePdu.setProductName("自助服务终端");
+        Rest<RespData<List<DevicePdu>>> rest = deviceFeign.list(devicePdu);
+        List<ConvergeDeviceEntity> deviceList = new ArrayList<>();
+        if(rest.getCode() > 0) {
+            for(DevicePdu device:rest.getData().getData()){
+                ConvergeDeviceEntity convergeDeviceEntity = convertByDevicePdu(device);
+                deviceList.add(convergeDeviceEntity);
+            }
+        }
+        devicePdu.setProductName("桌面式自助服务终端");
+        rest = deviceFeign.list(devicePdu);
+        if(rest.getCode() > 0) {
+            for(DevicePdu device:rest.getData().getData()){
+                ConvergeDeviceEntity convergeDeviceEntity = convertByDevicePdu(device);
+                deviceList.add(convergeDeviceEntity);
+            }
+        }
+        for(ConvergeDeviceEntity entity:deviceList){
+            ConvergeDeviceEntity temp = this.selectOne(new ConvergeDeviceQuery().logo(entity.getLogo()));
+            if(temp == null){
+                ConvergeSiteEntity siteEntity = convergeSiteService.selectOne(new ConvergeSiteQuery().siteId(entity.getSiteId()));
+                if(siteEntity!=null){
+                    entity.setBranchId(siteEntity.getId());
+                }
+                entity.setOpr("A");
+                this.save(entity);
+            }else {
+                if(equals(temp,entity)){
+                    entity.setOpr("P");
+                }else {
+                    entity.setOpr("U");
+                }
+                entity.setId(temp.getId());
+                this.update(entity);
+            }
+        }
+    }
+
+    private ConvergeDeviceEntity convertByDevicePdu(DevicePdu devicePdu){
+        ConvergeDeviceEntity entity = new ConvergeDeviceEntity();
+        entity.setEquipmentName(devicePdu.getDeviceName());
+        if(devicePdu.getProductName().equals("自助服务终端")){
+            entity.setSystemName("2");  //windows
+        }else {
+            entity.setSystemName("1");  //android
+        }
+        entity.setLogo(devicePdu.getDeviceCode());
+        entity.setIndustry("政务服务");
+        if(devicePdu.getDeviceStatus()==2){
+            entity.setIsAbnormal("Y");
+        }else {
+            entity.setIsAbnormal("N");
+        }
+        entity.setSiteId(devicePdu.getSiteId());
+        return entity;
+    }
+
+    private boolean equals(ConvergeDeviceEntity temp,ConvergeDeviceEntity entity){
+        if(!temp.getLogo().equals(entity.getLogo())){
+            return false;
+        }
+        if(!temp.getEquipmentName().equals(entity.getEquipmentName())){
+            return false;
+        }
+        if(!temp.getIsAbnormal().equals(entity.getIsAbnormal())){
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/service/impl/ConvergeSiteServiceImpl.java

+package com.mortals.xhx.module.converge.service.impl;
+import com.mortals.framework.common.Rest;
+import com.mortals.xhx.common.pdu.RespData;
+import com.mortals.xhx.common.pdu.device.DevicePdu;
+import com.mortals.xhx.common.pdu.site.SitePdu;
+import com.mortals.xhx.common.utils.BeanUtil;
+import com.mortals.xhx.feign.device.IDeviceFeign;
+import com.mortals.xhx.feign.site.ISiteFeign;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceQuery;
+import com.mortals.xhx.module.converge.model.ConvergeSiteQuery;
+import com.mortals.xhx.module.converge.model.vo.BranchVO;
+import com.mortals.xhx.module.converge.model.vo.EquipmentVO;
+import com.mortals.xhx.module.converge.service.ConvergeDeviceService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.model.Context;
+import com.mortals.xhx.module.converge.dao.ConvergeSiteDao;
+import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
+import com.mortals.xhx.module.converge.service.ConvergeSiteService;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+* ConvergeSiteService
+* 网点信息 service实现
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@Service("convergeSiteService")
+@Slf4j
+public class ConvergeSiteServiceImpl extends AbstractCRUDServiceImpl<ConvergeSiteDao, ConvergeSiteEntity, Long> implements ConvergeSiteService {
+
+    @Autowired
+    private ISiteFeign siteFeign;
+    @Autowired
+    private ConvergeDeviceService convergeDeviceService;
+
+    @Override
+    public List<BranchVO> getConvergeData() throws AppException {
+        List<BranchVO> result = new ArrayList<>();
+        List<ConvergeSiteEntity> siteList = this.find(new ConvergeSiteQuery());
+        if(CollectionUtils.isNotEmpty(siteList)){
+            for(ConvergeSiteEntity siteEntity:siteList){
+                BranchVO branchVO = new BranchVO();
+                BeanUtils.copyProperties(siteEntity,branchVO,BeanUtil.getNullPropertyNames(siteEntity));
+                List<ConvergeDeviceEntity> deviceEntityList = convergeDeviceService.find(new ConvergeDeviceQuery().siteId(siteEntity.getSiteId()));
+                if(CollectionUtils.isNotEmpty(deviceEntityList)){
+                    List<EquipmentVO> equipments = new ArrayList<>();
+                    for (ConvergeDeviceEntity deviceEntity:deviceEntityList){
+                        EquipmentVO equipmentVO = new EquipmentVO();
+                        BeanUtils.copyProperties(deviceEntity,equipmentVO,BeanUtil.getNullPropertyNames(deviceEntity));
+                        equipmentVO.setAppStats(Collections.emptyList());
+                        equipments.add(equipmentVO);
+                    }
+                    branchVO.setEquipments(equipments);
+                }else {
+                    branchVO.setEquipments(Collections.emptyList());
+                }
+                result.add(branchVO);
+
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public void doConvergeSite() throws AppException {
+        SitePdu query = new SitePdu();
+        query.setSize(-1);
+        Rest<RespData<List<SitePdu>>> result = siteFeign.list(query);
+        List<ConvergeSiteEntity> siteList = new ArrayList<>();
+        if(result.getCode() > 0) {
+            for(SitePdu sitePdu:result.getData().getData()){
+                ConvergeSiteEntity convergeSiteEntity = convertBySitePdu(sitePdu);
+                siteList.add(convergeSiteEntity);
+            }
+        }
+        for(ConvergeSiteEntity site:siteList){
+            ConvergeSiteEntity temp = this.selectOne(new ConvergeSiteQuery().branchLogo(site.getBranchLogo()));
+            if(temp == null){
+                site.setOpr("A");
+                this.save(site);
+            }else {
+                if(equals(temp,site)){
+                    site.setOpr("P");
+                }else {
+                    site.setOpr("U");
+                }
+                site.setId(temp.getId());
+                this.update(site);
+            }
+        }
+
+    }
+
+    private ConvergeSiteEntity convertBySitePdu(SitePdu sitePdu){
+        ConvergeSiteEntity entity = new ConvergeSiteEntity();
+        entity.setSiteId(sitePdu.getId());
+        entity.setBranchName(sitePdu.getSiteName());
+        entity.setBranchLogo(sitePdu.getSiteCode());
+        if(sitePdu.getStatus()!=null && sitePdu.getStatus()==1) {
+            entity.setStatus("Y");
+        }else {
+            entity.setStatus("N");
+        }
+        entity.setServerTime("星期一至星期五 上午：09:00-12:00 下午：14:00-17:00 备注：法定节假日除外;");
+        entity.setConsultPhone(sitePdu.getSiteTel());
+        entity.setBranchStyle("1");
+        entity.setAddress(sitePdu.getDetailAddress());
+        return entity;
+    }
+
+
+    private boolean equals(ConvergeSiteEntity temp,ConvergeSiteEntity entity){
+        if(!temp.getAddress().equals(entity.getAddress())){
+            return false;
+        }
+        if(!temp.getBranchLogo().equals(entity.getBranchLogo())){
+            return false;
+        }
+        if(!temp.getBranchName().equals(entity.getBranchName())){
+            return false;
+        }
+        if(!temp.getStatus().equals(entity.getStatus())){
+            return false;
+        }
+        if(!temp.getConsultPhone().equals(entity.getConsultPhone())){
+            return false;
+        }
+        return true;
+    }
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeAppsController.java

+package com.mortals.xhx.module.converge.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.converge.model.ConvergeAppsEntity;
+import com.mortals.xhx.module.converge.service.ConvergeAppsService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 设备应用
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@RestController
+@RequestMapping("converge/apps")
+public class ConvergeAppsController extends BaseCRUDJsonBodyMappingController<ConvergeAppsService,ConvergeAppsEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public ConvergeAppsController(){
+        super.setModuleDesc( "设备应用");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeDeviceController.java

+package com.mortals.xhx.module.converge.web;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.converge.model.ConvergeDeviceEntity;
+import com.mortals.xhx.module.converge.service.ConvergeDeviceService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 网点设备
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@RestController
+@RequestMapping("converge/device")
+public class ConvergeDeviceController extends BaseCRUDJsonBodyMappingController<ConvergeDeviceService,ConvergeDeviceEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public ConvergeDeviceController(){
+        super.setModuleDesc( "网点设备");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+
+}
\ No newline at end of file

sst-manager/src/main/java/com/mortals/xhx/module/converge/web/ConvergeSiteController.java

+package com.mortals.xhx.module.converge.web;
+import com.mortals.framework.annotation.UnAuth;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.PageInfo;
+import com.mortals.framework.model.Result;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.module.converge.model.vo.BranchVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import com.mortals.framework.model.Context;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
+import com.mortals.xhx.module.converge.model.ConvergeSiteEntity;
+import com.mortals.xhx.module.converge.service.ConvergeSiteService;
+import org.apache.commons.lang3.ArrayUtils;
+import com.mortals.framework.util.StringUtils;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import com.alibaba.fastjson.JSONObject;
+import java.util.Arrays;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import static com.mortals.framework.ap.SysConstains.*;
+/**
+*
+* 网点信息
+*
+* @author zxfei
+* @date 2023-06-12
+*/
+@RestController
+@RequestMapping("converge/site")
+public class ConvergeSiteController extends BaseCRUDJsonBodyMappingController<ConvergeSiteService,ConvergeSiteEntity,Long> {
+
+    @Autowired
+    private ParamService paramService;
+
+    public ConvergeSiteController(){
+        super.setModuleDesc( "网点信息");
+    }
+
+    @Override
+    protected void init(Map<String, Object> model, Context context) {
+        super.init(model, context);
+    }
+
+    @RequestMapping(
+            value = {"data"},
+            method = {RequestMethod.POST, RequestMethod.GET}
+    )
+    @UnAuth
+    public Rest<Object> getConvergeData() {
+        Rest<Object> ret = new Rest();
+        Map<String, Object> model = new HashMap();
+        Context context = this.getContext();
+        String busiDesc = "查询汇聚结果";
+
+        int code = 1;
+        try {
+            List<BranchVO> result = this.getService().getConvergeData();
+            model.put("data", result);
+            model.put("message_info", busiDesc + "成功");
+            this.recordSysLog(this.request, busiDesc + " 【成功】");
+        } catch (Exception var9) {
+            code = -1;
+            this.doException(this.request, busiDesc, model, var9);
+        }
+
+        this.init(model, context);
+        ret.setCode(code);
+        ret.setData(model);
+        ret.setDict(model.get("dict"));
+        ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
+        return ret;
+    }
+}
\ No newline at end of file

sst-manager/src/main/resources/sqlmap/module/converge/ConvergeAppsMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.converge.dao.ibatis.ConvergeAppsDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="ConvergeAppsEntity" id="ConvergeAppsEntity-Map">
+        <id  property="id" column="id" />
+        <result property="equipmentId" column="equipmentId" />
+        <result property="appEname" column="appEname" />
+        <result property="appName" column="appName" />
+        <result property="appSimpleName" column="appSimpleName" />
+        <result property="provider" column="provider" />
+        <result property="origin" column="origin" />
+        <result property="pv" column="pv" />
+        <result property="uv" column="uv" />
+        <result property="opr" column="opr" />
+        <result property="siteId" column="siteId" />
+
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                a.id,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('equipmentId') or colPickMode == 1 and data.containsKey('equipmentId')))">
+                a.equipmentId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appEname') or colPickMode == 1 and data.containsKey('appEname')))">
+                a.appEname,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appName') or colPickMode == 1 and data.containsKey('appName')))">
+                a.appName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('appSimpleName') or colPickMode == 1 and data.containsKey('appSimpleName')))">
+                a.appSimpleName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('provider') or colPickMode == 1 and data.containsKey('provider')))">
+                a.provider,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('origin') or colPickMode == 1 and data.containsKey('origin')))">
+                a.origin,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pv') or colPickMode == 1 and data.containsKey('pv')))">
+                a.pv,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('uv') or colPickMode == 1 and data.containsKey('uv')))">
+                a.uv,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('opr') or colPickMode == 1 and data.containsKey('opr')))">
+                a.opr,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="ConvergeAppsEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_converge_apps
+        (equipmentId,appEname,appName,appSimpleName,provider,origin,pv,uv,opr,siteId)
+        VALUES
+        (#{equipmentId},#{appEname},#{appName},#{appSimpleName},#{provider},#{origin},#{pv},#{uv},#{opr},#{siteId})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_converge_apps
+        (equipmentId,appEname,appName,appSimpleName,provider,origin,pv,uv,opr,siteId)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.equipmentId},#{item.appEname},#{item.appName},#{item.appSimpleName},#{item.provider},#{item.origin},#{item.pv},#{item.uv},#{item.opr},#{item.siteId})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_converge_apps as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('equipmentId')) or (colPickMode==1 and !data.containsKey('equipmentId'))">
+                a.equipmentId=#{data.equipmentId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('equipmentIdIncrement')) or (colPickMode==1 and !data.containsKey('equipmentIdIncrement'))">
+                a.equipmentId=ifnull(a.equipmentId,0) + #{data.equipmentIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('appEname')) or (colPickMode==1 and !data.containsKey('appEname'))">
+                a.appEname=#{data.appEname},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('appName')) or (colPickMode==1 and !data.containsKey('appName'))">
+                a.appName=#{data.appName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('appSimpleName')) or (colPickMode==1 and !data.containsKey('appSimpleName'))">
+                a.appSimpleName=#{data.appSimpleName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('provider')) or (colPickMode==1 and !data.containsKey('provider'))">
+                a.provider=#{data.provider},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('origin')) or (colPickMode==1 and !data.containsKey('origin'))">
+                a.origin=#{data.origin},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pv')) or (colPickMode==1 and !data.containsKey('pv'))">
+                a.pv=#{data.pv},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('pvIncrement')) or (colPickMode==1 and !data.containsKey('pvIncrement'))">
+                a.pv=ifnull(a.pv,0) + #{data.pvIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('uv')) or (colPickMode==1 and !data.containsKey('uv'))">
+                a.uv=#{data.uv},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('uvIncrement')) or (colPickMode==1 and !data.containsKey('uvIncrement'))">
+                a.uv=ifnull(a.uv,0) + #{data.uvIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('opr')) or (colPickMode==1 and !data.containsKey('opr'))">
+                a.opr=#{data.opr},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_converge_apps as a
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="equipmentId=(case" suffix="ELSE equipmentId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('equipmentId')) or (colPickMode==1 and !item.containsKey('equipmentId'))">
+                            when a.id=#{item.id} then #{item.equipmentId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('equipmentIdIncrement')) or (colPickMode==1 and !item.containsKey('equipmentIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.equipmentId,0) + #{item.equipmentIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="appEname=(case" suffix="ELSE appEname end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('appEname')) or (colPickMode==1 and !item.containsKey('appEname'))">
+                        when a.id=#{item.id} then #{item.appEname}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="appName=(case" suffix="ELSE appName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('appName')) or (colPickMode==1 and !item.containsKey('appName'))">
+                        when a.id=#{item.id} then #{item.appName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="appSimpleName=(case" suffix="ELSE appSimpleName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('appSimpleName')) or (colPickMode==1 and !item.containsKey('appSimpleName'))">
+                        when a.id=#{item.id} then #{item.appSimpleName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="provider=(case" suffix="ELSE provider end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('provider')) or (colPickMode==1 and !item.containsKey('provider'))">
+                        when a.id=#{item.id} then #{item.provider}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="origin=(case" suffix="ELSE origin end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('origin')) or (colPickMode==1 and !item.containsKey('origin'))">
+                        when a.id=#{item.id} then #{item.origin}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="pv=(case" suffix="ELSE pv end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('pv')) or (colPickMode==1 and !item.containsKey('pv'))">
+                            when a.id=#{item.id} then #{item.pv}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('pvIncrement')) or (colPickMode==1 and !item.containsKey('pvIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.pv,0) + #{item.pvIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="uv=(case" suffix="ELSE uv end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('uv')) or (colPickMode==1 and !item.containsKey('uv'))">
+                            when a.id=#{item.id} then #{item.uv}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('uvIncrement')) or (colPickMode==1 and !item.containsKey('uvIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.uv,0) + #{item.uvIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="opr=(case" suffix="ELSE opr end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('opr')) or (colPickMode==1 and !item.containsKey('opr'))">
+                        when a.id=#{item.id} then #{item.opr}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="ConvergeAppsEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_converge_apps as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_converge_apps as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_converge_apps where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_converge_apps where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_converge_apps where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_converge_apps as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="ConvergeAppsEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_converge_apps as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_converge_apps as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
+            </if>
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+            ${_conditionType_} a.id in
+            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+            ${_conditionType_} a.id not in
+            <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        </if>
+        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('equipmentId')">
+            <if test="conditionParamRef.equipmentId != null ">
+                ${_conditionType_} a.equipmentId = #{${_conditionParam_}.equipmentId}
+            </if>
+            <if test="conditionParamRef.equipmentId == null">
+                ${_conditionType_} a.equipmentId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('equipmentIdList') and conditionParamRef.equipmentIdList.size() > 0">
+            ${_conditionType_} a.equipmentId in
+            <foreach collection="conditionParamRef.equipmentIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('equipmentIdNotList') and conditionParamRef.equipmentIdNotList.size() > 0">
+            ${_conditionType_} a.equipmentId not in
+            <foreach collection="conditionParamRef.equipmentIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('equipmentIdStart') and conditionParamRef.equipmentIdStart != null">
+            ${_conditionType_} a.equipmentId <![CDATA[ >= ]]> #{${_conditionParam_}.equipmentIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('equipmentIdEnd') and conditionParamRef.equipmentIdEnd != null">
+            ${_conditionType_} a.equipmentId <![CDATA[ <= ]]> #{${_conditionParam_}.equipmentIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('appEname')">
+            <if test="conditionParamRef.appEname != null and conditionParamRef.appEname != ''">
+                ${_conditionType_} a.appEname like #{${_conditionParam_}.appEname}
+            </if>
+            <if test="conditionParamRef.appEname == null">
+                ${_conditionType_} a.appEname is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('appEnameList') and conditionParamRef.appEnameList.size() > 0">
+            ${_conditionType_} a.appEname in
+            <foreach collection="conditionParamRef.appEnameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appEnameNotList') and conditionParamRef.appEnameNotList.size() > 0">
+            ${_conditionType_} a.appEname not in
+            <foreach collection="conditionParamRef.appEnameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('appName')">
+            <if test="conditionParamRef.appName != null and conditionParamRef.appName != ''">
+                ${_conditionType_} a.appName like #{${_conditionParam_}.appName}
+            </if>
+            <if test="conditionParamRef.appName == null">
+                ${_conditionType_} a.appName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('appNameList') and conditionParamRef.appNameList.size() > 0">
+            ${_conditionType_} a.appName in
+            <foreach collection="conditionParamRef.appNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appNameNotList') and conditionParamRef.appNameNotList.size() > 0">
+            ${_conditionType_} a.appName not in
+            <foreach collection="conditionParamRef.appNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('appSimpleName')">
+            <if test="conditionParamRef.appSimpleName != null and conditionParamRef.appSimpleName != ''">
+                ${_conditionType_} a.appSimpleName like #{${_conditionParam_}.appSimpleName}
+            </if>
+            <if test="conditionParamRef.appSimpleName == null">
+                ${_conditionType_} a.appSimpleName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('appSimpleNameList') and conditionParamRef.appSimpleNameList.size() > 0">
+            ${_conditionType_} a.appSimpleName in
+            <foreach collection="conditionParamRef.appSimpleNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('appSimpleNameNotList') and conditionParamRef.appSimpleNameNotList.size() > 0">
+            ${_conditionType_} a.appSimpleName not in
+            <foreach collection="conditionParamRef.appSimpleNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('provider')">
+            <if test="conditionParamRef.provider != null and conditionParamRef.provider != ''">
+                ${_conditionType_} a.provider like #{${_conditionParam_}.provider}
+            </if>
+            <if test="conditionParamRef.provider == null">
+                ${_conditionType_} a.provider is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('providerList') and conditionParamRef.providerList.size() > 0">
+            ${_conditionType_} a.provider in
+            <foreach collection="conditionParamRef.providerList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('providerNotList') and conditionParamRef.providerNotList.size() > 0">
+            ${_conditionType_} a.provider not in
+            <foreach collection="conditionParamRef.providerNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('origin')">
+            <if test="conditionParamRef.origin != null and conditionParamRef.origin != ''">
+                ${_conditionType_} a.origin like #{${_conditionParam_}.origin}
+            </if>
+            <if test="conditionParamRef.origin == null">
+                ${_conditionType_} a.origin is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('originList') and conditionParamRef.originList.size() > 0">
+            ${_conditionType_} a.origin in
+            <foreach collection="conditionParamRef.originList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('originNotList') and conditionParamRef.originNotList.size() > 0">
+            ${_conditionType_} a.origin not in
+            <foreach collection="conditionParamRef.originNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('pv')">
+            <if test="conditionParamRef.pv != null ">
+                ${_conditionType_} a.pv = #{${_conditionParam_}.pv}
+            </if>
+            <if test="conditionParamRef.pv == null">
+                ${_conditionType_} a.pv is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('pvList') and conditionParamRef.pvList.size() > 0">
+            ${_conditionType_} a.pv in
+            <foreach collection="conditionParamRef.pvList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('pvNotList') and conditionParamRef.pvNotList.size() > 0">
+            ${_conditionType_} a.pv not in
+            <foreach collection="conditionParamRef.pvNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('pvStart') and conditionParamRef.pvStart != null">
+            ${_conditionType_} a.pv <![CDATA[ >= ]]> #{${_conditionParam_}.pvStart}
+        </if>
+        <if test="conditionParamRef.containsKey('pvEnd') and conditionParamRef.pvEnd != null">
+            ${_conditionType_} a.pv <![CDATA[ <= ]]> #{${_conditionParam_}.pvEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('uv')">
+            <if test="conditionParamRef.uv != null ">
+                ${_conditionType_} a.uv = #{${_conditionParam_}.uv}
+            </if>
+            <if test="conditionParamRef.uv == null">
+                ${_conditionType_} a.uv is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('uvList') and conditionParamRef.uvList.size() > 0">
+            ${_conditionType_} a.uv in
+            <foreach collection="conditionParamRef.uvList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('uvNotList') and conditionParamRef.uvNotList.size() > 0">
+            ${_conditionType_} a.uv not in
+            <foreach collection="conditionParamRef.uvNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('uvStart') and conditionParamRef.uvStart != null">
+            ${_conditionType_} a.uv <![CDATA[ >= ]]> #{${_conditionParam_}.uvStart}
+        </if>
+        <if test="conditionParamRef.containsKey('uvEnd') and conditionParamRef.uvEnd != null">
+            ${_conditionType_} a.uv <![CDATA[ <= ]]> #{${_conditionParam_}.uvEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('opr')">
+            <if test="conditionParamRef.opr != null and conditionParamRef.opr != ''">
+                ${_conditionType_} a.opr like #{${_conditionParam_}.opr}
+            </if>
+            <if test="conditionParamRef.opr == null">
+                ${_conditionType_} a.opr is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('oprList') and conditionParamRef.oprList.size() > 0">
+            ${_conditionType_} a.opr in
+            <foreach collection="conditionParamRef.oprList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('oprNotList') and conditionParamRef.oprNotList.size() > 0">
+            ${_conditionType_} a.opr not in
+            <foreach collection="conditionParamRef.oprNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
+
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                    ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('equipmentId')">
+                    a.equipmentId
+                    <if test='orderCol.equipmentId != null and "DESC".equalsIgnoreCase(orderCol.equipmentId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('appEname')">
+                    a.appEname
+                    <if test='orderCol.appEname != null and "DESC".equalsIgnoreCase(orderCol.appEname)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('appName')">
+                    a.appName
+                    <if test='orderCol.appName != null and "DESC".equalsIgnoreCase(orderCol.appName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('appSimpleName')">
+                    a.appSimpleName
+                    <if test='orderCol.appSimpleName != null and "DESC".equalsIgnoreCase(orderCol.appSimpleName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('provider')">
+                    a.provider
+                    <if test='orderCol.provider != null and "DESC".equalsIgnoreCase(orderCol.provider)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('origin')">
+                    a.origin
+                    <if test='orderCol.origin != null and "DESC".equalsIgnoreCase(orderCol.origin)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('pv')">
+                    a.pv
+                    <if test='orderCol.pv != null and "DESC".equalsIgnoreCase(orderCol.pv)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('uv')">
+                    a.uv
+                    <if test='orderCol.uv != null and "DESC".equalsIgnoreCase(orderCol.uv)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('opr')">
+                    a.opr
+                    <if test='orderCol.opr != null and "DESC".equalsIgnoreCase(orderCol.opr)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

sst-manager/src/main/resources/sqlmap/module/converge/ConvergeDeviceMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.converge.dao.ibatis.ConvergeDeviceDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="ConvergeDeviceEntity" id="ConvergeDeviceEntity-Map">
+        <id  property="id" column="id" />
+        <result property="branchId" column="branchId" />
+        <result property="equipmentName" column="equipmentName" />
+        <result property="systemName" column="systemName" />
+        <result property="logo" column="logo" />
+        <result property="industry" column="industry" />
+        <result property="isAbnormal" column="isAbnormal" />
+        <result property="opr" column="opr" />
+        <result property="siteId" column="siteId" />
+
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                a.id,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('branchId') or colPickMode == 1 and data.containsKey('branchId')))">
+                a.branchId,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('equipmentName') or colPickMode == 1 and data.containsKey('equipmentName')))">
+                a.equipmentName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('systemName') or colPickMode == 1 and data.containsKey('systemName')))">
+                a.systemName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logo') or colPickMode == 1 and data.containsKey('logo')))">
+                a.logo,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('industry') or colPickMode == 1 and data.containsKey('industry')))">
+                a.industry,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('isAbnormal') or colPickMode == 1 and data.containsKey('isAbnormal')))">
+                a.isAbnormal,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('opr') or colPickMode == 1 and data.containsKey('opr')))">
+                a.opr,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="ConvergeDeviceEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_converge_device
+        (branchId,equipmentName,systemName,logo,industry,isAbnormal,opr,siteId)
+        VALUES
+        (#{branchId},#{equipmentName},#{systemName},#{logo},#{industry},#{isAbnormal},#{opr},#{siteId})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_converge_device
+        (branchId,equipmentName,systemName,logo,industry,isAbnormal,opr,siteId)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.branchId},#{item.equipmentName},#{item.systemName},#{item.logo},#{item.industry},#{item.isAbnormal},#{item.opr},#{item.siteId})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_converge_device as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('branchId')) or (colPickMode==1 and !data.containsKey('branchId'))">
+                a.branchId=#{data.branchId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('branchIdIncrement')) or (colPickMode==1 and !data.containsKey('branchIdIncrement'))">
+                a.branchId=ifnull(a.branchId,0) + #{data.branchIdIncrement},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('equipmentName')) or (colPickMode==1 and !data.containsKey('equipmentName'))">
+                a.equipmentName=#{data.equipmentName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('systemName')) or (colPickMode==1 and !data.containsKey('systemName'))">
+                a.systemName=#{data.systemName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('logo')) or (colPickMode==1 and !data.containsKey('logo'))">
+                a.logo=#{data.logo},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('industry')) or (colPickMode==1 and !data.containsKey('industry'))">
+                a.industry=#{data.industry},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('isAbnormal')) or (colPickMode==1 and !data.containsKey('isAbnormal'))">
+                a.isAbnormal=#{data.isAbnormal},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('opr')) or (colPickMode==1 and !data.containsKey('opr'))">
+                a.opr=#{data.opr},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_converge_device as a
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="branchId=(case" suffix="ELSE branchId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('branchId')) or (colPickMode==1 and !item.containsKey('branchId'))">
+                            when a.id=#{item.id} then #{item.branchId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('branchIdIncrement')) or (colPickMode==1 and !item.containsKey('branchIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.branchId,0) + #{item.branchIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+            <trim prefix="equipmentName=(case" suffix="ELSE equipmentName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('equipmentName')) or (colPickMode==1 and !item.containsKey('equipmentName'))">
+                        when a.id=#{item.id} then #{item.equipmentName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="systemName=(case" suffix="ELSE systemName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('systemName')) or (colPickMode==1 and !item.containsKey('systemName'))">
+                        when a.id=#{item.id} then #{item.systemName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="logo=(case" suffix="ELSE logo end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('logo')) or (colPickMode==1 and !item.containsKey('logo'))">
+                        when a.id=#{item.id} then #{item.logo}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="industry=(case" suffix="ELSE industry end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('industry')) or (colPickMode==1 and !item.containsKey('industry'))">
+                        when a.id=#{item.id} then #{item.industry}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="isAbnormal=(case" suffix="ELSE isAbnormal end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('isAbnormal')) or (colPickMode==1 and !item.containsKey('isAbnormal'))">
+                        when a.id=#{item.id} then #{item.isAbnormal}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="opr=(case" suffix="ELSE opr end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('opr')) or (colPickMode==1 and !item.containsKey('opr'))">
+                        when a.id=#{item.id} then #{item.opr}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="ConvergeDeviceEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_converge_device as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_converge_device as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_converge_device where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_converge_device where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_converge_device where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_converge_device as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="ConvergeDeviceEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_converge_device as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_converge_device as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
+            </if>
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+            ${_conditionType_} a.id in
+            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+            ${_conditionType_} a.id not in
+            <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        </if>
+        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
+
+        <if test="conditionParamRef.containsKey('branchId')">
+            <if test="conditionParamRef.branchId != null ">
+                ${_conditionType_} a.branchId = #{${_conditionParam_}.branchId}
+            </if>
+            <if test="conditionParamRef.branchId == null">
+                ${_conditionType_} a.branchId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('branchIdList') and conditionParamRef.branchIdList.size() > 0">
+            ${_conditionType_} a.branchId in
+            <foreach collection="conditionParamRef.branchIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('branchIdNotList') and conditionParamRef.branchIdNotList.size() > 0">
+            ${_conditionType_} a.branchId not in
+            <foreach collection="conditionParamRef.branchIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('branchIdStart') and conditionParamRef.branchIdStart != null">
+            ${_conditionType_} a.branchId <![CDATA[ >= ]]> #{${_conditionParam_}.branchIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('branchIdEnd') and conditionParamRef.branchIdEnd != null">
+            ${_conditionType_} a.branchId <![CDATA[ <= ]]> #{${_conditionParam_}.branchIdEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('equipmentName')">
+            <if test="conditionParamRef.equipmentName != null and conditionParamRef.equipmentName != ''">
+                ${_conditionType_} a.equipmentName like #{${_conditionParam_}.equipmentName}
+            </if>
+            <if test="conditionParamRef.equipmentName == null">
+                ${_conditionType_} a.equipmentName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('equipmentNameList') and conditionParamRef.equipmentNameList.size() > 0">
+            ${_conditionType_} a.equipmentName in
+            <foreach collection="conditionParamRef.equipmentNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('equipmentNameNotList') and conditionParamRef.equipmentNameNotList.size() > 0">
+            ${_conditionType_} a.equipmentName not in
+            <foreach collection="conditionParamRef.equipmentNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('systemName')">
+            <if test="conditionParamRef.systemName != null and conditionParamRef.systemName != ''">
+                ${_conditionType_} a.systemName like #{${_conditionParam_}.systemName}
+            </if>
+            <if test="conditionParamRef.systemName == null">
+                ${_conditionType_} a.systemName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('systemNameList') and conditionParamRef.systemNameList.size() > 0">
+            ${_conditionType_} a.systemName in
+            <foreach collection="conditionParamRef.systemNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('systemNameNotList') and conditionParamRef.systemNameNotList.size() > 0">
+            ${_conditionType_} a.systemName not in
+            <foreach collection="conditionParamRef.systemNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('logo')">
+            <if test="conditionParamRef.logo != null and conditionParamRef.logo != ''">
+                ${_conditionType_} a.logo like #{${_conditionParam_}.logo}
+            </if>
+            <if test="conditionParamRef.logo == null">
+                ${_conditionType_} a.logo is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('logoList') and conditionParamRef.logoList.size() > 0">
+            ${_conditionType_} a.logo in
+            <foreach collection="conditionParamRef.logoList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('logoNotList') and conditionParamRef.logoNotList.size() > 0">
+            ${_conditionType_} a.logo not in
+            <foreach collection="conditionParamRef.logoNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('industry')">
+            <if test="conditionParamRef.industry != null and conditionParamRef.industry != ''">
+                ${_conditionType_} a.industry like #{${_conditionParam_}.industry}
+            </if>
+            <if test="conditionParamRef.industry == null">
+                ${_conditionType_} a.industry is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('industryList') and conditionParamRef.industryList.size() > 0">
+            ${_conditionType_} a.industry in
+            <foreach collection="conditionParamRef.industryList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('industryNotList') and conditionParamRef.industryNotList.size() > 0">
+            ${_conditionType_} a.industry not in
+            <foreach collection="conditionParamRef.industryNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('isAbnormal')">
+            <if test="conditionParamRef.isAbnormal != null and conditionParamRef.isAbnormal != ''">
+                ${_conditionType_} a.isAbnormal like #{${_conditionParam_}.isAbnormal}
+            </if>
+            <if test="conditionParamRef.isAbnormal == null">
+                ${_conditionType_} a.isAbnormal is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('isAbnormalList') and conditionParamRef.isAbnormalList.size() > 0">
+            ${_conditionType_} a.isAbnormal in
+            <foreach collection="conditionParamRef.isAbnormalList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('isAbnormalNotList') and conditionParamRef.isAbnormalNotList.size() > 0">
+            ${_conditionType_} a.isAbnormal not in
+            <foreach collection="conditionParamRef.isAbnormalNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('opr')">
+            <if test="conditionParamRef.opr != null and conditionParamRef.opr != ''">
+                ${_conditionType_} a.opr like #{${_conditionParam_}.opr}
+            </if>
+            <if test="conditionParamRef.opr == null">
+                ${_conditionType_} a.opr is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('oprList') and conditionParamRef.oprList.size() > 0">
+            ${_conditionType_} a.opr in
+            <foreach collection="conditionParamRef.oprList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('oprNotList') and conditionParamRef.oprNotList.size() > 0">
+            ${_conditionType_} a.opr not in
+            <foreach collection="conditionParamRef.oprNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
+
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                    ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('branchId')">
+                    a.branchId
+                    <if test='orderCol.branchId != null and "DESC".equalsIgnoreCase(orderCol.branchId)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('equipmentName')">
+                    a.equipmentName
+                    <if test='orderCol.equipmentName != null and "DESC".equalsIgnoreCase(orderCol.equipmentName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('systemName')">
+                    a.systemName
+                    <if test='orderCol.systemName != null and "DESC".equalsIgnoreCase(orderCol.systemName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('logo')">
+                    a.logo
+                    <if test='orderCol.logo != null and "DESC".equalsIgnoreCase(orderCol.logo)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('industry')">
+                    a.industry
+                    <if test='orderCol.industry != null and "DESC".equalsIgnoreCase(orderCol.industry)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('isAbnormal')">
+                    a.isAbnormal
+                    <if test='orderCol.isAbnormal != null and "DESC".equalsIgnoreCase(orderCol.isAbnormal)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('opr')">
+                    a.opr
+                    <if test='orderCol.opr != null and "DESC".equalsIgnoreCase(orderCol.opr)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file

sst-manager/src/main/resources/sqlmap/module/converge/ConvergeSiteMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "mybatis-3-mapper.dtd">
+<mapper namespace="com.mortals.xhx.module.converge.dao.ibatis.ConvergeSiteDaoImpl">
+
+    <!-- 字段和属性映射 -->
+    <resultMap type="ConvergeSiteEntity" id="ConvergeSiteEntity-Map">
+        <id  property="id" column="id" />
+        <result property="branchName" column="branchName" />
+        <result property="branchLogo" column="branchLogo" />
+        <result property="status" column="status" />
+        <result property="serverTime" column="serverTime" />
+        <result property="consultPhone" column="consultPhone" />
+        <result property="branchStyle" column="branchStyle" />
+        <result property="address" column="address" />
+        <result property="opr" column="opr" />
+        <result property="siteId" column="siteId" />
+
+    </resultMap>
+
+
+    <!-- 表所有列 -->
+    <sql id="_columns">
+        <trim suffixOverrides="," suffix="">
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
+                a.id,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('branchName') or colPickMode == 1 and data.containsKey('branchName')))">
+                a.branchName,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('branchLogo') or colPickMode == 1 and data.containsKey('branchLogo')))">
+                a.branchLogo,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
+                a.status,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('serverTime') or colPickMode == 1 and data.containsKey('serverTime')))">
+                a.serverTime,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('consultPhone') or colPickMode == 1 and data.containsKey('consultPhone')))">
+                a.consultPhone,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('branchStyle') or colPickMode == 1 and data.containsKey('branchStyle')))">
+                a.branchStyle,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('address') or colPickMode == 1 and data.containsKey('address')))">
+                a.address,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('opr') or colPickMode == 1 and data.containsKey('opr')))">
+                a.opr,
+            </if>
+            <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
+                a.siteId,
+            </if>
+        </trim>
+    </sql>
+    <!-- 新增 区分主键自增加还是业务插入 -->
+    <insert id="insert" parameterType="ConvergeSiteEntity"  useGeneratedKeys="true" keyProperty="id">
+        insert into mortals_xhx_converge_site
+        (branchName,branchLogo,status,serverTime,consultPhone,branchStyle,address,opr,siteId)
+        VALUES
+        (#{branchName},#{branchLogo},#{status},#{serverTime},#{consultPhone},#{branchStyle},#{address},#{opr},#{siteId})
+    </insert>
+
+    <!-- 批量新增 -->
+    <insert id="insertBatch" parameterType="paramDto">
+        insert into mortals_xhx_converge_site
+        (branchName,branchLogo,status,serverTime,consultPhone,branchStyle,address,opr,siteId)
+        VALUES
+        <foreach collection="data.dataList" item="item" index="index" separator="," >
+            (#{item.branchName},#{item.branchLogo},#{item.status},#{item.serverTime},#{item.consultPhone},#{item.branchStyle},#{item.address},#{item.opr},#{item.siteId})
+        </foreach>
+    </insert>
+
+
+    <!-- 根据ParamDto更新 -->
+    <update id="update" parameterType="paramDto">
+        update mortals_xhx_converge_site as a
+        set
+        <trim suffixOverrides="," suffix="">
+            <if test="(colPickMode==0 and data.containsKey('branchName')) or (colPickMode==1 and !data.containsKey('branchName'))">
+                a.branchName=#{data.branchName},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('branchLogo')) or (colPickMode==1 and !data.containsKey('branchLogo'))">
+                a.branchLogo=#{data.branchLogo},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('status')) or (colPickMode==1 and !data.containsKey('status'))">
+                a.status=#{data.status},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('serverTime')) or (colPickMode==1 and !data.containsKey('serverTime'))">
+                a.serverTime=#{data.serverTime},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('consultPhone')) or (colPickMode==1 and !data.containsKey('consultPhone'))">
+                a.consultPhone=#{data.consultPhone},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('branchStyle')) or (colPickMode==1 and !data.containsKey('branchStyle'))">
+                a.branchStyle=#{data.branchStyle},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('address')) or (colPickMode==1 and !data.containsKey('address'))">
+                a.address=#{data.address},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('opr')) or (colPickMode==1 and !data.containsKey('opr'))">
+                a.opr=#{data.opr},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
+                a.siteId=#{data.siteId},
+            </if>
+            <if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
+                a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
+            </if>
+        </trim>
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </update>
+    <!-- 批量更新 -->
+    <update id="updateBatch" parameterType="paramDto">
+        update mortals_xhx_converge_site as a
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="branchName=(case" suffix="ELSE branchName end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('branchName')) or (colPickMode==1 and !item.containsKey('branchName'))">
+                        when a.id=#{item.id} then #{item.branchName}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="branchLogo=(case" suffix="ELSE branchLogo end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('branchLogo')) or (colPickMode==1 and !item.containsKey('branchLogo'))">
+                        when a.id=#{item.id} then #{item.branchLogo}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="status=(case" suffix="ELSE status end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
+                        when a.id=#{item.id} then #{item.status}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="serverTime=(case" suffix="ELSE serverTime end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('serverTime')) or (colPickMode==1 and !item.containsKey('serverTime'))">
+                        when a.id=#{item.id} then #{item.serverTime}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="consultPhone=(case" suffix="ELSE consultPhone end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('consultPhone')) or (colPickMode==1 and !item.containsKey('consultPhone'))">
+                        when a.id=#{item.id} then #{item.consultPhone}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="branchStyle=(case" suffix="ELSE branchStyle end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('branchStyle')) or (colPickMode==1 and !item.containsKey('branchStyle'))">
+                        when a.id=#{item.id} then #{item.branchStyle}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="address=(case" suffix="ELSE address end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('address')) or (colPickMode==1 and !item.containsKey('address'))">
+                        when a.id=#{item.id} then #{item.address}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="opr=(case" suffix="ELSE opr end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <if test="(colPickMode==0 and item.containsKey('opr')) or (colPickMode==1 and !item.containsKey('opr'))">
+                        when a.id=#{item.id} then #{item.opr}
+                    </if>
+                </foreach>
+            </trim>
+            <trim prefix="siteId=(case" suffix="ELSE siteId end),">
+                <foreach collection="data.dataList" item="item" index="index" separator="" >
+                    <choose>
+                        <when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
+                            when a.id=#{item.id} then #{item.siteId}
+                        </when>
+                        <when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
+                            when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
+                        </when>
+                    </choose>
+                </foreach>
+            </trim>
+        </trim>
+        where id in
+        <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </update>
+    <!-- 根据主健查询 -->
+    <select id="getByKey" parameterType="paramDto" resultMap="ConvergeSiteEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_converge_site as a
+        where a.id=#{condition.id}
+    </select>
+    <!-- 根据主健删除 -->
+    <delete id="deleteByKey" parameterType="paramDto">
+        delete a.* from mortals_xhx_converge_site as a where a.id=#{condition.id}
+    </delete>
+    <!-- 根据主健删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeys">
+        delete from mortals_xhx_converge_site where id in
+        <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+    <!-- 根据主健列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByKeyList">
+        delete from mortals_xhx_converge_site where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
+
+    <!-- 根据对象列表删除一批，针对单一主健有效 -->
+    <delete id="deleteByEntityList">
+        delete from mortals_xhx_converge_site where id in
+        <foreach collection="list" item="item" index="index" open="(" separator="," close=")">
+            #{item.id}
+        </foreach>
+    </delete>
+    <!-- 根据paramDto删除一批 -->
+    <delete id="deleteByMap" parameterType="paramDto">
+        delete a.* from mortals_xhx_converge_site as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </delete>
+    <!-- 获取列表 -->
+    <select id="getList" parameterType="paramDto" resultMap="ConvergeSiteEntity-Map">
+        select <include refid="_columns"/>
+        from mortals_xhx_converge_site as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+        <include refid="_orderCols_"/>
+    </select>
+
+
+
+    <!-- 获取 -->
+    <select id="getListCount" parameterType="paramDto" resultType="int">
+        select count(1)
+        from mortals_xhx_converge_site as a
+        <trim suffixOverrides="where" suffix="">
+            where
+            <trim prefixOverrides="and" prefix="">
+                <include refid="_condition_"/>
+            </trim>
+        </trim>
+    </select>
+    <!-- 条件映射 -->
+    <sql id="_condition_">
+        <if test="condition != null and !condition.isEmpty()">
+            <!-- 条件映射-普通条件 -->
+            <include refid="_condition_param_">
+                <property name="_conditionParam_" value="condition"/>
+                <property name="_conditionType_" value="and"/>
+            </include>
+            <!-- 条件映射-集合之间使用AND，集合中元素使用OR-(list[0].1 or list[0].2) and (list[1].3 or list[1].4) -->
+            <if test="condition.containsKey('andConditionList') and !condition.andConditionList.isEmpty()">
+                and
+                <foreach collection="condition.andConditionList" open="(" close=")" index="index" item="andCondition" separator=" and ">
+                    <trim prefixOverrides="or" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="andCondition"/>
+                            <property name="_conditionType_" value="or"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+            <!-- 条件映射-集合之间使用OR，集合中元素使用AND-(list[0].1 and list[0].2) or (list[1].3 and list[1].4) -->
+            <if test="condition.containsKey('orConditionList') and !condition.orConditionList.isEmpty()">
+                and
+                <foreach collection="condition.orConditionList" open="(" close=")" index="index" item="orCondition" separator=" or ">
+                    <trim prefixOverrides="and" prefix="(" suffix=")">
+                        <include refid="_condition_param_">
+                            <property name="_conditionParam_" value="orCondition"/>
+                            <property name="_conditionType_" value="and"/>
+                        </include>
+                    </trim>
+                </foreach>
+            </if>
+        </if>
+    </sql>
+    <!-- 条件映射-代参数 -->
+    <sql id="_condition_param_">
+        <bind name="conditionParamRef" value="${_conditionParam_}"/>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null">
+                ${_conditionType_} a.id=#{${_conditionParam_}.id}
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('id')">
+            <if test="conditionParamRef.id != null ">
+                ${_conditionType_} a.id = #{${_conditionParam_}.id}
+            </if>
+            <if test="conditionParamRef.id == null">
+                ${_conditionType_} a.id is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
+            ${_conditionType_} a.id in
+            <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
+            ${_conditionType_} a.id not in
+            <foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
+            ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
+        </if>
+        <if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
+            ${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
+        </if>
+
+
+        <if test="conditionParamRef.containsKey('branchName')">
+            <if test="conditionParamRef.branchName != null and conditionParamRef.branchName != ''">
+                ${_conditionType_} a.branchName like #{${_conditionParam_}.branchName}
+            </if>
+            <if test="conditionParamRef.branchName == null">
+                ${_conditionType_} a.branchName is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('branchNameList') and conditionParamRef.branchNameList.size() > 0">
+            ${_conditionType_} a.branchName in
+            <foreach collection="conditionParamRef.branchNameList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('branchNameNotList') and conditionParamRef.branchNameNotList.size() > 0">
+            ${_conditionType_} a.branchName not in
+            <foreach collection="conditionParamRef.branchNameNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('branchLogo')">
+            <if test="conditionParamRef.branchLogo != null and conditionParamRef.branchLogo != ''">
+                ${_conditionType_} a.branchLogo like #{${_conditionParam_}.branchLogo}
+            </if>
+            <if test="conditionParamRef.branchLogo == null">
+                ${_conditionType_} a.branchLogo is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('branchLogoList') and conditionParamRef.branchLogoList.size() > 0">
+            ${_conditionType_} a.branchLogo in
+            <foreach collection="conditionParamRef.branchLogoList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('branchLogoNotList') and conditionParamRef.branchLogoNotList.size() > 0">
+            ${_conditionType_} a.branchLogo not in
+            <foreach collection="conditionParamRef.branchLogoNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('status')">
+            <if test="conditionParamRef.status != null and conditionParamRef.status != ''">
+                ${_conditionType_} a.status like #{${_conditionParam_}.status}
+            </if>
+            <if test="conditionParamRef.status == null">
+                ${_conditionType_} a.status is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('statusList') and conditionParamRef.statusList.size() > 0">
+            ${_conditionType_} a.status in
+            <foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('statusNotList') and conditionParamRef.statusNotList.size() > 0">
+            ${_conditionType_} a.status not in
+            <foreach collection="conditionParamRef.statusNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('serverTime')">
+            <if test="conditionParamRef.serverTime != null and conditionParamRef.serverTime != ''">
+                ${_conditionType_} a.serverTime like #{${_conditionParam_}.serverTime}
+            </if>
+            <if test="conditionParamRef.serverTime == null">
+                ${_conditionType_} a.serverTime is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('serverTimeList') and conditionParamRef.serverTimeList.size() > 0">
+            ${_conditionType_} a.serverTime in
+            <foreach collection="conditionParamRef.serverTimeList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('serverTimeNotList') and conditionParamRef.serverTimeNotList.size() > 0">
+            ${_conditionType_} a.serverTime not in
+            <foreach collection="conditionParamRef.serverTimeNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('consultPhone')">
+            <if test="conditionParamRef.consultPhone != null and conditionParamRef.consultPhone != ''">
+                ${_conditionType_} a.consultPhone like #{${_conditionParam_}.consultPhone}
+            </if>
+            <if test="conditionParamRef.consultPhone == null">
+                ${_conditionType_} a.consultPhone is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('consultPhoneList') and conditionParamRef.consultPhoneList.size() > 0">
+            ${_conditionType_} a.consultPhone in
+            <foreach collection="conditionParamRef.consultPhoneList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('consultPhoneNotList') and conditionParamRef.consultPhoneNotList.size() > 0">
+            ${_conditionType_} a.consultPhone not in
+            <foreach collection="conditionParamRef.consultPhoneNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('branchStyle')">
+            <if test="conditionParamRef.branchStyle != null and conditionParamRef.branchStyle != ''">
+                ${_conditionType_} a.branchStyle like #{${_conditionParam_}.branchStyle}
+            </if>
+            <if test="conditionParamRef.branchStyle == null">
+                ${_conditionType_} a.branchStyle is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('branchStyleList') and conditionParamRef.branchStyleList.size() > 0">
+            ${_conditionType_} a.branchStyle in
+            <foreach collection="conditionParamRef.branchStyleList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('branchStyleNotList') and conditionParamRef.branchStyleNotList.size() > 0">
+            ${_conditionType_} a.branchStyle not in
+            <foreach collection="conditionParamRef.branchStyleNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('address')">
+            <if test="conditionParamRef.address != null and conditionParamRef.address != ''">
+                ${_conditionType_} a.address like #{${_conditionParam_}.address}
+            </if>
+            <if test="conditionParamRef.address == null">
+                ${_conditionType_} a.address is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('addressList') and conditionParamRef.addressList.size() > 0">
+            ${_conditionType_} a.address in
+            <foreach collection="conditionParamRef.addressList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('addressNotList') and conditionParamRef.addressNotList.size() > 0">
+            ${_conditionType_} a.address not in
+            <foreach collection="conditionParamRef.addressNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+
+        <if test="conditionParamRef.containsKey('opr')">
+            <if test="conditionParamRef.opr != null and conditionParamRef.opr != ''">
+                ${_conditionType_} a.opr like #{${_conditionParam_}.opr}
+            </if>
+            <if test="conditionParamRef.opr == null">
+                ${_conditionType_} a.opr is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('oprList') and conditionParamRef.oprList.size() > 0">
+            ${_conditionType_} a.opr in
+            <foreach collection="conditionParamRef.oprList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('oprNotList') and conditionParamRef.oprNotList.size() > 0">
+            ${_conditionType_} a.opr not in
+            <foreach collection="conditionParamRef.oprNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteId')">
+            <if test="conditionParamRef.siteId != null ">
+                ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
+            </if>
+            <if test="conditionParamRef.siteId == null">
+                ${_conditionType_} a.siteId is null
+            </if>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
+            ${_conditionType_} a.siteId in
+            <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
+            ${_conditionType_} a.siteId not in
+            <foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
+            ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
+        </if>
+        <if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
+            ${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
+        </if>
+
+    </sql>
+    <sql id="_orderCols_">
+        <if test="orderColList != null and !orderColList.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
+                    ${item.colName} ${item.sortKind}
+                </foreach>
+            </trim>
+        </if>
+        <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
+            order by
+            <trim suffixOverrides=","  suffix="">
+                <if test="orderCol.containsKey('id')">
+                    a.id
+                    <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('branchName')">
+                    a.branchName
+                    <if test='orderCol.branchName != null and "DESC".equalsIgnoreCase(orderCol.branchName)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('branchLogo')">
+                    a.branchLogo
+                    <if test='orderCol.branchLogo != null and "DESC".equalsIgnoreCase(orderCol.branchLogo)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('status')">
+                    a.status
+                    <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('serverTime')">
+                    a.serverTime
+                    <if test='orderCol.serverTime != null and "DESC".equalsIgnoreCase(orderCol.serverTime)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('consultPhone')">
+                    a.consultPhone
+                    <if test='orderCol.consultPhone != null and "DESC".equalsIgnoreCase(orderCol.consultPhone)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('branchStyle')">
+                    a.branchStyle
+                    <if test='orderCol.branchStyle != null and "DESC".equalsIgnoreCase(orderCol.branchStyle)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('address')">
+                    a.address
+                    <if test='orderCol.address != null and "DESC".equalsIgnoreCase(orderCol.address)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('opr')">
+                    a.opr
+                    <if test='orderCol.opr != null and "DESC".equalsIgnoreCase(orderCol.opr)'>DESC</if>
+                    ,
+                </if>
+                <if test="orderCol.containsKey('siteId')">
+                    a.siteId
+                    <if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
+                    ,
+                </if>
+            </trim>
+        </if>
+    </sql>
+    <sql id="_group_by_">
+        <if test="groupList != null and !groupList.isEmpty()">
+            GROUP BY
+            <trim suffixOverrides=","  suffix="">
+                <foreach collection="groupList" open="" close="" index="index" item="item" separator=",">
+                    ${item}
+                </foreach>
+            </trim>
+        </if>
+    </sql>
+</mapper>
\ No newline at end of file