天府通办数据汇聚接口

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/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/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/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