From 4a50bd93dfcdedb85f117d25f89e67291eb65cf7 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 14 Oct 2023 10:55:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 457 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 448 insertions(+), 9 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 5038125..d281aa0 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
@@ -2,22 +2,36 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.moral.api.entity.*;
import com.moral.api.mapper.*;
+import com.moral.api.pojo.redisBean.SpecialDeviceInfoDTO;
+import com.moral.api.pojo.vo.device.DeviceVO;
import com.moral.api.service.SpecialDeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.util.AdjustDataUtils;
+import com.moral.api.util.CacheUtils;
+import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
import com.moral.constant.ResponseCodeEnum;
+import com.moral.util.DateUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+import javax.servlet.http.HttpServletRequest;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* <p>
@@ -48,6 +62,42 @@
@Autowired(required = false)
private OrganizationMapper organizationMapper;
+ @Autowired(required = false)
+ private RedisTemplate redisTemplate;
+
+ @Autowired(required = false)
+ private OrganizationUnitAlarmMapper organizationUnitAlarmMapper;
+
+ @Autowired(required = false)
+ private VersionSensorUnitMapper versionSensorUnitMapper;
+
+ @Autowired(required = false)
+ private GovMonitorPointMapper govMonitorPointMapper;
+
+ @Autowired
+ private AdjustDataUtils adjustDataUtils;
+
+ /*
+ * ���redis������������������
+ * */
+ private SpecialDeviceInfoDTO getDeviceInfoFromRedis(String mac) {
+ return (SpecialDeviceInfoDTO) redisTemplate.opsForHash().get(RedisConstants.SPECIAL_DEVICE, mac);
+ }
+
+ /*
+ * ������������������redis
+ */
+ private void setDeviceInfoToRedis(String mac, SpecialDeviceInfoDTO specialDeviceInfoDTO) {
+ redisTemplate.opsForHash().put(RedisConstants.SPECIAL_DEVICE, mac, specialDeviceInfoDTO);
+ }
+
+ /*
+ * ���redis������������������
+ */
+ private void delDeviceInfoFromRedis(String mac) {
+ redisTemplate.opsForHash().delete(RedisConstants.SPECIAL_DEVICE, mac);
+ }
+
@Override
public Map<String, Object> getDataByCondition(Map map) {
Map<String,Object> resultMap = new HashMap<>();
@@ -62,13 +112,15 @@
QueryWrapper<SpecialDevice> wrapper_Condition = new QueryWrapper<>();
wrapper_Condition.eq("is_delete",Constants.NOT_DELETE);
if (!ObjectUtils.isEmpty(map.get("organization_id"))){
- wrapper_Condition.like("organization_id",map.get("organization_id").toString());
+ wrapper_Condition.eq("organization_id",map.get("organization_id").toString());
}
if (!ObjectUtils.isEmpty(map.get("keyword"))){
- wrapper_Condition.like("name",map.get("keyword").toString()).or().like("mac",map.get("keyword").toString());
+ wrapper_Condition.and(wc -> wc.like("name",map.get("keyword").toString()).or().like("mac",map.get("keyword").toString()));
+ //wrapper_Condition.like("name",map.get("keyword").toString()).or().like("mac",map.get("keyword").toString());
}
wrapper_Condition.orderByDesc("create_time");
Page resultPage = specialDeviceMapper.selectPage(page,wrapper_Condition);
+ int totalNumber = specialDeviceMapper.selectCount(wrapper_Condition);
List<SpecialDevice> specialDevices = resultPage.getRecords();
SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<Map<String,Object>> specialDeviceList = new ArrayList<>();
@@ -78,6 +130,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();
@@ -90,6 +156,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<>();
@@ -112,7 +179,7 @@
deviceVersionMap.put("name",version.getName());
}
}
- specialDeviceMap.put("deviceVersion",deviceVersionMap);
+ specialDeviceMap.put("version",deviceVersionMap);
Map<String,Object> specialTypeMap = new HashMap<>();
if (!ObjectUtils.isEmpty(specialDevice.getSpecialType()) && specialDevice.getSpecialType()!=null && !"".equals(specialDevice.getSpecialType())){
int specialTypeId = Integer.parseInt(specialDevice.getSpecialType().toString());
@@ -123,6 +190,7 @@
SysDictData sysDictData = sysDictDataMapper.selectOne(wapper_sysDictData);
if (!ObjectUtils.isEmpty(sysDictData)){
specialTypeMap.put("id",sysDictData.getId());
+ specialTypeMap.put("dataKey",sysDictData.getDataKey());
specialTypeMap.put("name",sysDictData.getDataValue());
}
}
@@ -139,7 +207,7 @@
organizationMap.put("name",organization.getName());
}
}
- specialDeviceMap.put("organazation",organizationMap);
+ specialDeviceMap.put("organization",organizationMap);
List<Map<String,Object>> organizationList = new ArrayList<>();
QueryWrapper<SpecialDeviceHistory> wapper_specialDeviceHistory = new QueryWrapper<>();
wapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE);
@@ -165,7 +233,6 @@
specialDeviceList.add(specialDeviceMap);
}
resultMap.put("specialDevices",specialDeviceList);
- int totalNumber = specialDevices.size();
resultMap.put("totalNumber",totalNumber);
resultMap.put("current",current);
int totalPageNumber = totalNumber/size;
@@ -175,4 +242,376 @@
resultMap.put("totalPageNumber",totalPageNumber);
return resultMap;
}
+
+ @Transactional
+ @Override
+ public Map<String, Object> insert(SpecialDevice specialDevice) {
+ Map<String,Object> resultMap = new HashMap<>();
+ String name = specialDevice.getName();
+ String mac = specialDevice.getMac();
+ int organizationId = specialDevice.getOrganizationId();
+ int deviceVersionId = specialDevice.getDeviceVersionId();
+ String operateIds = specialDevice.getOperateIds();
+ String specialType = specialDevice.getSpecialType();
+ if (ObjectUtils.isEmpty(name) || ObjectUtils.isEmpty(mac) || ObjectUtils.isEmpty(specialType) || ObjectUtils.isEmpty(organizationId) || ObjectUtils.isEmpty(deviceVersionId)){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
+ return resultMap;
+ }
+ if (name.equals("") || mac.equals("") || specialType.equals("")){
+ resultMap.put("code",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getCode());
+ resultMap.put("msg",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getMsg());
+ return resultMap;
+ }
+ QueryWrapper<SpecialDevice> wrapper_mac = new QueryWrapper<>();
+ wrapper_mac.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_mac.eq("mac",mac);
+ int macNum = specialDeviceMapper.selectCount(wrapper_mac);
+ if (macNum>0){
+ resultMap.put("code",ResponseCodeEnum.MAC_IS_EXIST.getCode());
+ resultMap.put("msg",ResponseCodeEnum.MAC_IS_EXIST.getMsg());
+ return resultMap;
+ }
+ specialDeviceMapper.insert(specialDevice);
+ QueryWrapper<SpecialDeviceHistory> wrapper_specialDeviceHistory = new QueryWrapper<>();
+ wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_specialDeviceHistory.eq("mac",mac);
+ wrapper_specialDeviceHistory.eq("organization_id",organizationId);
+ SpecialDeviceHistory specialDeviceHistory = specialDeviceHistoryMapper.selectOne(wrapper_specialDeviceHistory);
+ SpecialDeviceHistory insertSpecialDeviceHistory = new SpecialDeviceHistory();
+ BeanUtils.copyProperties(specialDevice,insertSpecialDeviceHistory);
+ if (ObjectUtils.isEmpty(specialDeviceHistory)){
+ specialDeviceHistoryMapper.insert(insertSpecialDeviceHistory);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������������������������").append(insertSpecialDeviceHistory.getName()).append(":").append("mac���").append(insertSpecialDeviceHistory.getMac());
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+ }else {
+ /*UpdateWrapper<SpecialDeviceHistory> wrapper_insertSpecialDeviceHistory = new UpdateWrapper<>();
+ wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_specialDeviceHistory.eq("mac",mac);
+ wrapper_specialDeviceHistory.eq("organization_id",organizationId);*/
+ specialDeviceHistoryMapper.update(insertSpecialDeviceHistory,wrapper_specialDeviceHistory);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������������").append(specialDeviceHistory.getId()).append("���");
+ Field[] fields = SpecialDevice.class.getDeclaredFields();
+ for (Field field : fields) {
+ if (field.getName().equals("id")) {
+ continue;
+ }
+ if ("serialVersionUID".equals(field.getName())) {
+ continue;
+ }
+ String fieldName = field.getName();
+ PropertyDescriptor pd = null;
+ try {
+ pd = new PropertyDescriptor(fieldName, SpecialDeviceHistory.class);
+ Method method = pd.getReadMethod();
+ Object o1 = method.invoke(specialDeviceHistory);
+ Object o2 = method.invoke(insertSpecialDeviceHistory);
+ if (o2 != null) {
+ content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":");
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ }
+ //Map<String, Object> deviceInfo = selectDeviceInfoById(specialDevice.getId());
+ SpecialDeviceInfoDTO specialDeviceInfoDTO = selectDeviceInfoDTOById(specialDevice.getId());
+ //���������������������������
+ insertOrganizationUnitAlarm(specialDevice.getOrganizationId(), specialDevice.getDeviceVersionId());
+ //������������������������redis
+ String mac1 = specialDevice.getMac();
+ //���redis���������������������
+ delDeviceInfoFromRedis(mac1);
+ //������������������redis
+ setDeviceInfoToRedis(mac1, specialDeviceInfoDTO);
+ //������deviceInfo������
+ CacheUtils.refreshSpecialDeviceAlarmInfo();
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������������").append(specialDevice.getName()).append(":").append("mac���").append(mac);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+ resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
+ resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg());
+ return resultMap;
+ }
+
+ @Transactional
+ @Override
+ public void update(SpecialDevice specialDevice) {
+ Integer specialDeviceId = specialDevice.getId();
+ SpecialDevice oldSpecialDevice = specialDeviceMapper.selectById(specialDeviceId);
+ specialDeviceMapper.updateById(specialDevice);
+ SpecialDevice updateSpecialDevice = specialDeviceMapper.selectById(specialDeviceId);
+ String oleMac = oldSpecialDevice.getMac();
+ //���������������������������
+ Integer oldOrgId = oldSpecialDevice.getOrganizationId();
+ Integer newOrgId = updateSpecialDevice.getOrganizationId();
+ Integer oldVersionId = oldSpecialDevice.getDeviceVersionId();
+ Integer newVersionId = updateSpecialDevice.getDeviceVersionId();
+ if (!oldOrgId.equals(newOrgId) || !oldVersionId.equals(newVersionId)) {
+ deleteOrganizationUnitAlarm(oldOrgId, oldVersionId);
+ insertOrganizationUnitAlarm(newOrgId, newVersionId);
+ }
+ //���redis���������������������
+ delDeviceInfoFromRedis(oleMac);
+ SpecialDeviceInfoDTO specialDeviceInfoDTO = selectDeviceInfoDTOById(specialDevice.getId());
+ //������������������redis
+ setDeviceInfoToRedis(updateSpecialDevice.getMac(), specialDeviceInfoDTO);
+ //������deviceInfo������
+ CacheUtils.refreshSpecialDeviceAlarmInfo();
+ QueryWrapper<SpecialDeviceHistory> wrapper_specialDeviceHistory = new QueryWrapper<>();
+ wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_specialDeviceHistory.eq("mac",updateSpecialDevice.getMac());
+ wrapper_specialDeviceHistory.eq("organization_id",updateSpecialDevice.getOrganizationId());
+ SpecialDeviceHistory specialDeviceHistory = specialDeviceHistoryMapper.selectOne(wrapper_specialDeviceHistory);
+ SpecialDeviceHistory updateSpecialDeviceHistory = new SpecialDeviceHistory();
+ BeanUtils.copyProperties(updateSpecialDevice,updateSpecialDeviceHistory);
+ updateSpecialDeviceHistory.setCreateTime(null);
+ updateSpecialDeviceHistory.setUpdateTime(null);
+ updateSpecialDeviceHistory.setIsDelete(null);
+ if (ObjectUtils.isEmpty(specialDeviceHistory)){
+ specialDeviceHistoryMapper.insert(updateSpecialDeviceHistory);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������������������������").append(updateSpecialDeviceHistory.getName()).append(":").append("mac���").append(updateSpecialDeviceHistory.getMac());
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
+ }else {
+ /*UpdateWrapper<SpecialDeviceHistory> wrapper_insertSpecialDeviceHistory = new UpdateWrapper<>();
+ wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_specialDeviceHistory.eq("mac",mac);
+ wrapper_specialDeviceHistory.eq("organization_id",organizationId);*/
+ specialDeviceHistoryMapper.update(updateSpecialDeviceHistory,wrapper_specialDeviceHistory);
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������������������").append(specialDeviceHistory.getId()).append(";");
+ Field[] fields = SpecialDevice.class.getDeclaredFields();
+ for (Field field : fields) {
+ if (field.getName().equals("id")) {
+ continue;
+ }
+ if ("serialVersionUID".equals(field.getName())) {
+ continue;
+ }
+ String fieldName = field.getName();
+ PropertyDescriptor pd = null;
+ try {
+ pd = new PropertyDescriptor(fieldName, SpecialDeviceHistory.class);
+ Method method = pd.getReadMethod();
+ Object o1 = method.invoke(specialDeviceHistory);
+ Object o2 = method.invoke(updateSpecialDeviceHistory);
+ if (o2 != null) {
+ content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(";");
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ }
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������������").append(specialDeviceId).append(";");
+ Field[] fields = SpecialDevice.class.getDeclaredFields();
+ for (Field field : fields) {
+ if (field.getName().equals("id")) {
+ continue;
+ }
+ if ("serialVersionUID".equals(field.getName())) {
+ continue;
+ }
+ String fieldName = field.getName();
+ PropertyDescriptor pd = null;
+ try {
+ pd = new PropertyDescriptor(fieldName, SpecialDevice.class);
+ Method method = pd.getReadMethod();
+ Object o1 = method.invoke(oldSpecialDevice);
+ Object o2 = method.invoke(specialDevice);
+ if (o2 != null) {
+ content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(";");
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE);
+ }
+
+ @Override
+ public void delete(Integer specialDeviceId) {
+ SpecialDevice specialDevice = specialDeviceMapper.selectById(specialDeviceId);
+ UpdateWrapper<SpecialDevice> updateWrapper = new UpdateWrapper<>();
+ updateWrapper.eq("id",specialDeviceId).set("is_delete",Constants.DELETE);
+ specialDeviceMapper.update(null,updateWrapper);
+ String mac = specialDevice.getMac();
+ //���redis���������������������
+ delDeviceInfoFromRedis(mac);
+ //���������������������������
+ Integer versionId = specialDevice.getDeviceVersionId();
+ Integer orgId = specialDevice.getOrganizationId();
+ deleteOrganizationUnitAlarm(orgId, versionId);
+ //������deviceInfo������
+ CacheUtils.refreshSpecialDeviceAlarmInfo();
+ //������������������
+ HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+ StringBuilder content = new StringBuilder();
+ content.append("������������������").append(specialDevice.getName()).append(";").append("mac���").append(mac);
+ LogUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE);
+ }
+
+ @Override
+ public Map<String, Object> selectDeviceInfoById(Integer deviceId) {
+ return null;
+ }
+
+ @Override
+ public SpecialDeviceInfoDTO selectDeviceInfoDTOById(Integer deviceId) {
+ String mac = specialDeviceMapper.selectById(deviceId).getMac();
+ SpecialDeviceInfoDTO specialDeviceInfoDTO = new SpecialDeviceInfoDTO();
+ SpecialDeviceInfoDTO specialDeviceInfoDTORedis = getDeviceInfoFromRedis(mac);
+ //������redis������
+ if (specialDeviceInfoDTORedis != null) {
+ return specialDeviceInfoDTORedis;
+ }
+
+ //������������������������
+ SpecialDevice specialDeviceInfo = new SpecialDevice();
+ SpecialDevice specialDevice = specialDeviceMapper.selectById(deviceId);
+ System.out.println(specialDevice);
+ /*specialDeviceInfo.setId(specialDevice.getId());
+ specialDeviceInfo.setName(specialDevice.getName());
+ specialDeviceInfo.setMac(specialDevice.getMac());
+ specialDeviceInfo.setCreateTime(specialDevice.getCreateTime());*/
+ specialDeviceInfoDTO.setSpecialDevice(specialDevice);
+
+ //������������������������
+ GovMonitorPoint govMonitorPointInfo = new GovMonitorPoint();
+ QueryWrapper<GovMonitorPoint> wrapper_govMonitorPoint = new QueryWrapper<>();
+ wrapper_govMonitorPoint.eq("is_delete",Constants.NOT_DELETE);
+ wrapper_govMonitorPoint.eq("guid",specialDevice.getGuid());
+ GovMonitorPoint govMonitorPoint = govMonitorPointMapper.selectOne(wrapper_govMonitorPoint);
+ /*govMonitorPointInfo.setId(govMonitorPoint.getId());
+ govMonitorPointInfo.setGuid(govMonitorPoint.getGuid());
+ govMonitorPointInfo.setName(govMonitorPoint.getName());*/
+ specialDeviceInfoDTO.setGovMonitorPoint(govMonitorPoint);
+
+ //������������������
+ Version versionInfo = new Version();
+ Version version = versionMapper.selectById(specialDevice.getDeviceVersionId());
+ /*versionInfo.setId(version.getId());
+ versionInfo.setName(version.getName());*/
+ specialDeviceInfoDTO.setVersion(version);
+
+ //���������������
+ List<ManageAccount> operatorsInfo = new ArrayList<>();
+ String operateIds = specialDevice.getOperateIds();
+ if (!ObjectUtils.isEmpty(operateIds)){
+ String[] operateIdArr = operateIds.split(",");
+ if (operateIdArr.length > 0){
+ List<Integer> operateIdList = new ArrayList<>();
+ for (int i = 0; i < operateIdArr.length; i++){
+ operateIdList.add(Integer.parseInt(operateIdArr[i]));
+ }
+ QueryWrapper<ManageAccount> wapper_manageAccount = new QueryWrapper<>();
+ wapper_manageAccount.eq("is_delete",Constants.NOT_DELETE);
+ wapper_manageAccount.in("id",operateIdList);
+ operatorsInfo = manageAccountMapper.selectList(wapper_manageAccount);
+ }
+ }
+ specialDeviceInfoDTO.setOperates(operatorsInfo);
+
+ //������������
+ Organization organizationInfo = new Organization();
+ organizationInfo = organizationMapper.selectById(specialDevice.getOrganizationId());
+ specialDeviceInfoDTO.setOrganization(organizationInfo);
+
+ return specialDeviceInfoDTO;
+ }
+
+ @Override
+ public Map<String, Object> adjustSpecialDeviceData(Map<String, Object> deviceData) {
+// String mac = deviceData.remove("mac").toString();
+ String mac = deviceData.get("mac").toString();
+ //���redis������������������
+ Map<String, Object> adjustFormula = redisTemplate.opsForHash().entries(RedisConstants.ADJUST + "_" + mac);
+ if (!org.springframework.util.ObjectUtils.isEmpty(adjustFormula)) {
+ SpecialDeviceInfoDTO specialDeviceInfo = getDeviceInfoFromRedis(mac);
+ if (org.springframework.util.ObjectUtils.isEmpty(specialDeviceInfo)) {
+ QueryWrapper<SpecialDevice> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("mac", mac).eq("is_delete", Constants.NOT_DELETE);
+ SpecialDevice specialDevice = specialDeviceMapper.selectOne(queryWrapper);
+ if (specialDevice != null) {
+ specialDeviceInfo = selectDeviceInfoDTOById(specialDevice.getId());
+ setDeviceInfoToRedis(mac, specialDeviceInfo);
+ }
+ }
+ //������������������������������������
+ //Map<String, Object> govMpInfo = (Map<String, Object>) specialDeviceInfo.getGovMonitorPoint();
+ Map<String, Object> govMpInfo = JSON.parseObject(JSON.toJSONString(specialDeviceInfo.getGovMonitorPoint()),Map.class);
+ Map<String, Object> aqiMap = null;
+ if (null != govMpInfo && null != govMpInfo.get("guid")) {
+ aqiMap = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMpInfo.get("guid").toString());
+ }
+ return adjustDataUtils.adjust(deviceData, adjustFormula, org.springframework.util.ObjectUtils.isEmpty(aqiMap) ? null : aqiMap,"0");
+ }
+ deviceData.remove("DataTime");
+ return deviceData;
+ }
+
+ 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 (org.springframework.util.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);
+ if (!org.springframework.util.ObjectUtils.isEmpty(versionSensorUnits)) {
+ for (VersionSensorUnit versionSensorUnit : versionSensorUnits) {
+ OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
+ organizationUnitAlarm.setOrganizationId(orgId);
+ organizationUnitAlarm.setVersionId(versionId);
+ organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());
+ organizationUnitAlarm.setUnitKey(versionSensorUnit.getUnitKey());
+ organizationUnitAlarm.setShowUnitKey(versionSensorUnit.getUnitKey());
+ organizationUnitAlarmMapper.insert(organizationUnitAlarm);
+ }
+ }
+ }
+ }
+
+ private void deleteOrganizationUnitAlarm(Integer orgId, Integer versionId) {
+ QueryWrapper<SpecialDevice> queryOrganizationVersionWrapper = new QueryWrapper<>();
+ queryOrganizationVersionWrapper.eq("organization_id", orgId);
+ queryOrganizationVersionWrapper.eq("device_version_id", versionId);
+ queryOrganizationVersionWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<SpecialDevice> specialDevices = specialDeviceMapper.selectList(queryOrganizationVersionWrapper);
+ if (org.springframework.util.ObjectUtils.isEmpty(specialDevices)) {//������������������������������������������������������
+ UpdateWrapper deleteWrapper = new UpdateWrapper();
+ deleteWrapper.eq("organization_id", orgId);
+ deleteWrapper.eq("version_id", versionId);
+ deleteWrapper.eq("is_delete", Constants.NOT_DELETE);
+ deleteWrapper.set("is_delete", Constants.DELETE);
+ organizationUnitAlarmMapper.update(null, deleteWrapper);
+ }
+ }
}
--
Gitblit v1.8.0