添加设备相关

fill-manager/db/module.sql

@@ -247,7 +247,60 @@ CREATE TABLE mortals_xhx_matter_datum_print(
        PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='打印提交';
 
+-- ----------------------------
+-- 设备表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_device`;
+CREATE TABLE `mortals_xhx_device` (
+      `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
+      `deviceId` bigint(20) DEFAULT NULL COMMENT '设备id',
+      `deviceName` varchar(20) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '设备名称',
+      `deviceCode` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '设备编码',
+      `deviceMac` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '设备的MAC地址',
+      `siteId` bigint(20) DEFAULT NULL COMMENT '站点Id',
+      `siteCode` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '站点编号，来源基础服务平台',
+      `siteName` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '站点名称',
+      `productCode` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '产品编码',
+      `productName` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '产品名称',
+      `deviceSrc` tinyint(2) DEFAULT 2 COMMENT '设备来源(0.子设备，1.网关设备，2.直连设备)',
+      `lon` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '经度',
+      `lati` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '纬度',
+      `leadingOfficial` varchar(10) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '负责人',
+      `leadingOfficialTelephone` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '联系电话',
+      `deviceStatus` tinyint(2) DEFAULT NULL COMMENT '设备状态 (0.未激活，1.离线,2.在线)',
+      `deviceRemark` varchar(256) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
+      `source` tinyint(2) DEFAULT 1 COMMENT '设备来源(0.旧设备，1.新设备)',
+      `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
+      `createTime` datetime NOT NULL COMMENT '创建时间',
+      `updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户',
+      `updateTime` datetime DEFAULT NULL COMMENT '更新时间',
+      PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 COMMENT='设备';
 
+-- ----------------------------
+-- 设备事项申请材料业务表
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_device_matter_datum`;
+CREATE TABLE mortals_xhx_device_matter_datum(
+    `id` bigint(20)   AUTO_INCREMENT   COMMENT '主键，自增长',
+    `siteId` bigint(20)      COMMENT '站点ID',
+    `deviceId` bigint(20)      COMMENT '设备id',
+    `deviceCode` varchar(255)      COMMENT '设备编码',
+    `deviceName` varchar(255)      COMMENT '设备名称',
+    `matterId` bigint(20)      COMMENT '事项id',
+    `matterCode` varchar(255)      COMMENT '事项编码',
+    `matterName` varchar(255)      COMMENT '事项名称',
+    `deptId` bigint(20)      COMMENT '部门ID',
+    `deptCode` varchar(256)      COMMENT '部门编号',
+    `deptName` varchar(256)      COMMENT '部门名称',
+    `source` tinyint(2)      COMMENT '事项来源(0.政务网，1.自定义)',
+    `isRecommend` tinyint(2)      COMMENT '是否推荐(0.未推荐，1.推荐)',
+    `sort` int(4)      COMMENT '排序',
+    `createTime` datetime      COMMENT '创建时间',
+    `createUserId` bigint(20)      COMMENT '创建用户',
+    `updateTime` datetime      COMMENT '修改时间',
+    PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备事项申请材料业务';
 
 
 

fill-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java

+package com.mortals.xhx.daemon.task;
+
+import com.alibaba.fastjson.JSON;
+import com.mortals.framework.common.Rest;
+import com.mortals.framework.exception.AppException;
+import com.mortals.framework.service.ITask;
+import com.mortals.framework.service.ITaskExcuteService;
+import com.mortals.xhx.common.code.YesNoEnum;
+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.device.model.DeviceEntity;
+import com.mortals.xhx.module.device.model.DeviceQuery;
+import com.mortals.xhx.module.device.service.DeviceService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 同步事项列表
+ */
+@Slf4j
+@Service("SyncSiteDeviceTask")
+public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
+
+    @Autowired
+    private ISiteFeign siteFeign;
+    @Autowired
+    private IDeviceFeign deviceFeign;
+    @Autowired
+    private DeviceService deviceService;
+
+    @Override
+    public void excuteTask(ITask task) throws AppException {
+        log.info("开始同步设备列表！");
+        SitePdu sitePdu = new SitePdu();
+        sitePdu.setId(1L);
+        Rest<List<SitePdu>> siteRest = siteFeign.getFlatSitesBySiteId(sitePdu);
+        if (siteRest.getCode() == YesNoEnum.YES.getValue()) {
+            log.info("站点总数量：{}", siteRest.getData().size());
+            siteRest.getData().forEach(site -> {
+                log.info("站点名称:{}",site.getSiteName());
+                DevicePdu devicePdu = new DevicePdu();
+                devicePdu.setProductCode("ybj");
+                devicePdu.setSize(-1);
+                Rest<RespData<List<DevicePdu>>> deviceRest = deviceFeign.list(devicePdu);
+                log.info("deviceRest：{}",JSON.toJSONString(deviceRest));
+                if (YesNoEnum.YES.getValue() == deviceRest.getCode()) {
+                    List<DevicePdu> devicePduList = deviceRest.getData().getData();
+                    log.info("样表机总数量：{}", devicePduList.size());
+                    if (!ObjectUtils.isEmpty(devicePduList)) {
+                        List<DeviceEntity> newDeviceList = devicePduList.stream().map(newDevice -> {
+                            DeviceEntity deviceEntity = new DeviceEntity();
+                            deviceEntity.initAttrValue();
+                            BeanUtils.copyProperties(newDevice, deviceEntity, BeanUtil.getNullPropertyNames(newDevice));
+                            return deviceEntity;
+                        }).collect(Collectors.toList());
+
+                        List<DeviceEntity> oldDeviceList = deviceService.find(new DeviceQuery().siteId(site.getId()));
+                        Map<String, DeviceEntity> oldDeviceMap = oldDeviceList.stream().collect(Collectors.toMap(x -> x.getDeviceCode(), y -> y, (o, n) -> n));
+                        List<DeviceEntity> updateDeviceLsit = newDeviceList.stream().map(item -> {
+                            if (oldDeviceMap.containsKey(item.getDeviceCode())) {
+                                item.setId(oldDeviceMap.get(item.getDeviceCode()).getId());
+                                item.setDeviceId(item.getId());
+                                item.setUpdateTime(new Date());
+                                return item;
+                            }
+                            return null;
+                        }).filter(f -> f != null).collect(Collectors.toList());
+
+
+                        List<DeviceEntity> saveDeviceList = newDeviceList.stream().map(item -> {
+                            if (!oldDeviceMap.containsKey(item.getDeviceCode())) {
+                                item.setDeviceId(item.getId());
+                                item.setCreateUserId(1L);
+                                item.setCreateUserName("系统管理员");
+                                item.setCreateTime(new Date());
+                                return item;
+                            }
+                            return null;
+                        }).filter(f -> f != null).collect(Collectors.toList());
+
+                        if (!ObjectUtils.isEmpty(updateDeviceLsit)) {
+                            log.info("设备更新，size:{}", updateDeviceLsit.size());
+                            deviceService.update(updateDeviceLsit);
+                        }
+
+                        if (!ObjectUtils.isEmpty(saveDeviceList)) {
+                            log.info("设备新增，size:{}", saveDeviceList.size());
+                            deviceService.save(saveDeviceList);
+                        }
+                    }
+                } else {
+                    log.info("设备列表查询异常，{}", JSON.toJSONString(deviceRest));
+                }
+            });
+        } else {
+            log.info("站点列表查询异常，{}", JSON.toJSONString(siteRest));
+        }
+    }
+
+    @Override
+    public void stopTask(ITask task) throws AppException {
+
+    }
+}

fill-manager/src/main/java/com/mortals/xhx/module/device/dao/DeviceDao.java

@@ -8,8 +8,9 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
 * 设备 DAO接口
 *
 * @author zxfei
-* @date 2022-06-27
+* @date 2023-02-25
 */
+
 public interface  DeviceDao extends ICRUDDao<DeviceEntity,Long>{
 
 

fill-manager/src/main/java/com/mortals/xhx/module/device/dao/DeviceMatterDatumDao.java

+package com.mortals.xhx.module.device.dao;
+
+import com.mortals.framework.dao.ICRUDDao;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+
+/**
+* 设备事项申请材料业务Dao
+* 设备事项申请材料业务 DAO接口
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+
+public interface  DeviceMatterDatumDao extends ICRUDDao<DeviceMatterDatumEntity,Long>{
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/device/dao/ibatis/DeviceDaoImpl.java

@@ -10,7 +10,7 @@ import org.springframework.stereotype.Repository;
 * 设备DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2022-06-27
+* @date 2023-02-25
 */
 @Repository("deviceDao")
 public class DeviceDaoImpl extends BaseCRUDDaoMybatis<DeviceEntity,Long> implements DeviceDao {

fill-manager/src/main/java/com/mortals/xhx/module/device/dao/ibatis/DeviceMatterDatumDaoImpl.java

+package com.mortals.xhx.module.device.dao.ibatis;
+
+
+import com.mortals.framework.dao.ibatis.BaseCRUDDaoMybatis;
+import com.mortals.xhx.module.device.dao.DeviceMatterDatumDao;
+import com.mortals.xhx.module.device.model.DeviceMatterDatumEntity;
+import org.springframework.stereotype.Repository;
+
+/**
+* 设备事项申请材料业务DaoImpl DAO接口
+*
+* @author zxfei
+* @date 2023-02-25
+*/
+@Repository("deviceMatterDatumDao")
+public class DeviceMatterDatumDaoImpl extends BaseCRUDDaoMybatis<DeviceMatterDatumEntity,Long> implements DeviceMatterDatumDao {
+
+
+
+}

fill-manager/src/main/java/com/mortals/xhx/module/device/model/vo/DeviceMatterDatumVo.java

+package com.mortals.xhx.module.device.model.vo;
+
+import com.mortals.framework.model.BaseEntityLong;
+import com.mortals.xhx.module.matter.model.MatterDatumEntity;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 设备事项申请材料业务视图对象
+ *
+ * @author zxfei
+ * @date 2023-02-25
+ */
+@Data
+public class DeviceMatterDatumVo extends BaseEntityLong {
+
+    private List<MatterDatumEntity> matterDatumList;
+
+}
\ No newline at end of file