jinpengyong
2021-09-26 c7d5088dbd18cbbcb98d12aeac35e7d38cdf93be
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceHistoryServiceImpl.java
@@ -47,6 +47,9 @@
    @Autowired(required = false)
    private OrganizationMapper organizationMapper;
    @Autowired(required = false)
    private GovMonitorPointMapper govMonitorPointMapper;
    @Autowired
    LogUtils logUtils;
@@ -82,6 +85,20 @@
            String updateTime = SDF.format(specialDeviceHistory.getUpdateTime());
            specialDeviceHistoryMap.put("createTime",createTime);
            specialDeviceHistoryMap.put("updateTime",updateTime);
            Map<String,Object> govMonitorPointMap = new HashMap<>();
            if (!ObjectUtils.isEmpty(specialDeviceHistory.getGuid()) && specialDeviceHistory.getGuid()!=null && !"".equals(specialDeviceHistory.getGuid())){
                String  guid = specialDeviceHistory.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());
                }
            }
            specialDeviceHistoryMap.put("govMonitorPoint",govMonitorPointMap);
            List<Map<String,Object>> operateList = new ArrayList<>();
            if (!ObjectUtils.isEmpty(specialDeviceHistory.getOperateIds()) && specialDeviceHistory.getOperateIds()!=null){
                String operateIds = specialDeviceHistory.getOperateIds();