From f502917e38fa5817aee2452fa7b1f9331269f0c8 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 15 Sep 2021 09:55:09 +0800
Subject: [PATCH] 修改device实体类
---
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
index 1de7eac..c25c945 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
+++ b/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();
@@ -447,7 +464,7 @@
Integer orgId = specialDevice.getOrganizationId();
deleteOrganizationUnitAlarm(orgId, versionId);
//������deviceInfo������
- CacheUtils.refreshDeviceAlarmInfo();
+ CacheUtils.refreshSpecialDeviceAlarmInfo();
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -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());
--
Gitblit v1.8.0