From 10d4b885a9b2af2a38bb03249d7547283f948197 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 13 Sep 2021 13:15:18 +0800
Subject: [PATCH] screen-api 增加获取无人机数据接口
---
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 6 +++++-
1 files changed, 5 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 bfca277..e802b36 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
@@ -137,6 +137,7 @@
QueryWrapper<ManageAccount> wapper_manageAccount = new QueryWrapper<>();
wapper_manageAccount.eq("is_delete",Constants.NOT_DELETE);
wapper_manageAccount.in("id",operateIdList);
+ wapper_manageAccount.select("id", "user_name");
List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wapper_manageAccount);
for (ManageAccount manageAccount:manageAccounts) {
Map<String,Object> operateMap = new HashMap<>();
@@ -446,7 +447,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();
@@ -510,6 +511,9 @@
Organization organization = organizationMapper.selectById(specialDevice.getOrganizationId());
orgInfo.put("id", organization.getId());
orgInfo.put("name", organization.getName());
+ orgInfo.put("areaCode", organization.getAreaCode());
+ orgInfo.put("cityCode", organization.getCityCode());
+ orgInfo.put("provinceCode", organization.getProvinceCode());
specialDeviceInfo.put("organization", orgInfo);
setDeviceInfoToRedis(mac, specialDeviceInfo);
--
Gitblit v1.8.0