From cf0f815f1343ad9ae25184f2e1c294442a32b3c1 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 16 Sep 2021 16:12:50 +0800
Subject: [PATCH] screen-manage 修改测试控制器代码
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index 60db004..66b431a 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -12,6 +12,7 @@
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SysDictDataService;
import com.moral.api.util.CacheUtils;
import com.moral.api.util.AdjustDataUtils;
import com.moral.api.util.LogUtils;
@@ -70,6 +71,9 @@
@Autowired
private SysDictDataMapper sysDictDataMapper;
+
+ @Autowired
+ private SysDictDataService sysDictDataService;
@Autowired
private LogUtils logUtils;
@@ -387,6 +391,16 @@
mpInfo.put("provinceCode", monitorPoint.getProvinceCode());
deviceInfo.put("monitorPoint", mpInfo);
+ //������������
+ Map<String, Object> govMpInfo = new LinkedHashMap<>();
+
+ govMpInfo.put("guid", null);
+ govMpInfo.put("name", null);
+ if (device.getGovMonitorPoint() != null) {
+ govMpInfo.put("guid", device.getGovMonitorPoint().getGuid());
+ govMpInfo.put("name", device.getGovMonitorPoint().getName());
+ }
+ deviceInfo.put("govMonitorPoint", govMpInfo);
setDeviceInfoToRedis(mac, deviceInfo);
return deviceInfo;
}
@@ -513,20 +527,37 @@
return state;
}
+ /**
+ * @Description: ���������������������������������������������������������������������������������������������
+ * @Param: [orgId, versionId]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/9/6
+ */
private void insertOrganizationUnitAlarm(Integer orgId, Integer versionId) {
+ //���������������������������
QueryWrapper<OrganizationUnitAlarm> queryOrganizationVersionWrapper = new QueryWrapper<>();
queryOrganizationVersionWrapper.eq("organization_id", orgId);
queryOrganizationVersionWrapper.eq("version_id", versionId);
queryOrganizationVersionWrapper.eq("is_delete", Constants.NOT_DELETE);
List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryOrganizationVersionWrapper);
+ //������������������������������������
if (ObjectUtils.isEmpty(organizationUnitAlarms)) {
+ //������������������������������
QueryWrapper<VersionSensorUnit> queryVersionSensorUnitWrapper = new QueryWrapper<>();
queryVersionSensorUnitWrapper.eq("version_id", versionId);
queryVersionSensorUnitWrapper.eq("is_delete", Constants.NOT_DELETE);
List<VersionSensorUnit> versionSensorUnits = versionSensorUnitMapper.selectList(queryVersionSensorUnitWrapper);
+ //������������������������������������
+ Map<String, SysDictData> sensorAlarms = sysDictDataService.getDictDatasByType("defaultAlarm");
if (!ObjectUtils.isEmpty(versionSensorUnits)) {
for (VersionSensorUnit versionSensorUnit : versionSensorUnits) {
OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
+ String sensorCode = versionSensorUnit.getSensorCode();
+ //���������������������
+ SysDictData alarm = sensorAlarms.get(sensorCode);
+ if(alarm!=null)
+ organizationUnitAlarm.setAlarmLevel(alarm.getDataValue());
organizationUnitAlarm.setOrganizationId(orgId);
organizationUnitAlarm.setVersionId(versionId);
organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());
@@ -538,6 +569,13 @@
}
}
+ /**
+ * @Description: ������������������������������������������������������������������������������������������������������������������������������������
+ * @Param: [orgId, versionId]
+ * @return: void
+ * @Author: ���������
+ * @Date: 2021/9/6
+ */
private void deleteOrganizationUnitAlarm(Integer orgId, Integer versionId) {
QueryWrapper<Device> queryOrganizationVersionWrapper = new QueryWrapper<>();
queryOrganizationVersionWrapper.eq("organization_id", orgId);
--
Gitblit v1.8.0