特殊设备添加guid字段，修改相关接口

lizijie

2021-09-13 35bedb798dc6a84d1dd316ebd882ef1edb9f87f3

特殊设备添加guid字段，修改相关接口

 screen-manage/src/main/java/com/moral/api/entity/SpecialDevice.java

@@ -42,6 +42,11 @@
    private String mac;

    /**
     * 政府站点id
     */
    private String guid;

    /**
     * 维护人id，多个逗号隔开，来源于manage_account
     */
    private String operateIds;

 screen-manage/src/main/java/com/moral/api/entity/SpecialDeviceHistory.java

@@ -41,6 +41,11 @@
    private String mac;

    /**
     * 政府站点id
     */
    private String guid;

    /**
     * 维护人id，多个逗号隔开，来源于manage_account
     */
    private String operateIds;

 screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java

@@ -69,6 +69,9 @@
    @Autowired(required = false)
    private VersionSensorUnitMapper versionSensorUnitMapper;

    @Autowired(required = false)
    private GovMonitorPointMapper govMonitorPointMapper;

    @Autowired
    private LogUtils logUtils;

@@ -125,6 +128,20 @@
            String updateTime = SDF.format(specialDevice.getUpdateTime());
            specialDeviceMap.put("createTime",createTime);
            specialDeviceMap.put("updateTime",updateTime);
            Map<String,Object> govMonitorPointMap = new HashMap<>();
            if (!ObjectUtils.isEmpty(specialDevice.getGuid()) && specialDevice.getGuid()!=null && !"".equals(specialDevice.getGuid())){
                String  guid = specialDevice.getGuid().toString();
                QueryWrapper<GovMonitorPoint> wapper_govMonitorPoint = new QueryWrapper<>();
                wapper_govMonitorPoint.eq("is_delete",Constants.NOT_DELETE);
                wapper_govMonitorPoint.eq("guid",guid);
                GovMonitorPoint govMonitorPoint = govMonitorPointMapper.selectOne(wapper_govMonitorPoint);
                if (!ObjectUtils.isEmpty(govMonitorPoint)){
                    govMonitorPointMap.put("id",govMonitorPoint.getId());
                    govMonitorPointMap.put("guid",govMonitorPoint.getGuid());
                    govMonitorPointMap.put("name",govMonitorPoint.getName());
                }
            }
            specialDeviceMap.put("govMonitorPoint",govMonitorPointMap);
            List<Map<String,Object>> operateList = new ArrayList<>();
            if (!ObjectUtils.isEmpty(specialDevice.getOperateIds()) && specialDevice.getOperateIds()!=null){
                String operateIds = specialDevice.getOperateIds();
@@ -471,6 +488,7 @@
        specialDeviceInfo.put("name", specialDevice.getName());
        specialDeviceInfo.put("mac", specialDevice.getMac());
        specialDeviceInfo.put("createTime", DateUtils.dateToDateString(specialDevice.getCreateTime()));
        specialDeviceInfo.put("guid", specialDevice.getGuid());

        //扩展字段
        //specialDeviceInfo.put("extend", device.getExtend());