From 5c1b7da4cecaf44871695d08595289f8def72021 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 21 Jun 2021 09:10:33 +0800
Subject: [PATCH] screen-manage 删除组织时，判断该组织是否还包含该型号，如果没有该型号，则维护型号组织关系表
---
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 156 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 132 insertions(+), 24 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 01836ff..39190df 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
@@ -1,34 +1,26 @@
package com.moral.api.service.impl;
+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.extension.plugins.pagination.Page;
-import com.moral.api.entity.Device;
-import com.moral.api.entity.ManageAccount;
-import com.moral.api.entity.MonitorPoint;
-import com.moral.api.entity.Organization;
-import com.moral.api.entity.SysDictData;
-import com.moral.api.entity.SysDictType;
-import com.moral.api.entity.Version;
-import com.moral.api.mapper.DeviceMapper;
-import com.moral.api.mapper.ManageAccountMapper;
-import com.moral.api.mapper.MonitorPointMapper;
-import com.moral.api.mapper.OrganizationMapper;
-import com.moral.api.mapper.SysDictDataMapper;
-import com.moral.api.mapper.SysDictTypeMapper;
+import com.moral.api.entity.*;
+import com.moral.api.mapper.*;
import com.moral.api.pojo.vo.device.DeviceVO;
import com.moral.api.service.DeviceService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.util.LogUtils;
import com.moral.constant.Constants;
-import com.moral.redis.RedisUtil;
+import com.moral.constant.RedisConstants;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
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.util.ObjectUtils;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@@ -75,6 +67,54 @@
@Autowired
private LogUtils logUtils;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
+ @Autowired
+ private OrganizationUnitAlarmMapper organizationUnitAlarmMapper;
+
+ @Autowired
+ private VersionSensorUnitMapper versionSensorUnitMapper;
+
+ /*
+ * ���redis������������������
+ * */
+ private Map<String, Object> getDeviceInfoFromRedis(String mac) {
+ Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForValue().get(RedisConstants.DEVICE + mac);
+ return deviceInfo;
+ }
+
+ /*
+ * ������������������redis
+ */
+ private void setDeviceInfoToRedis(String mac, Map<String, Object> deviceInfo) {
+ redisTemplate.opsForValue().set(getDeviceKey(mac), deviceInfo);
+ }
+
+ /*
+ * ���redis������������������
+ */
+ private void delDeviceInfoFromRedis(String mac) {
+ redisTemplate.delete(getDeviceKey(mac));
+ }
+
+ /*
+ * ���������������������redis������key
+ */
+ private String getDeviceKey(String mac) {
+ return keysConnect(RedisConstants.DEVICE, mac);
+ }
+
+ //redis key������
+ private String keysConnect(String... keys) {
+ StringBuilder key = new StringBuilder(keys[0]);
+ for (int i = 1; i < keys.length; i++) {
+ key.append("_");
+ key.append(keys[i]);
+ }
+ return key.toString().toLowerCase();
+ }
+
@Override
@Transactional
public void insert(Device device) {
@@ -82,13 +122,38 @@
device.setOrganizationId(orgId);
deviceMapper.insert(device);
Map<String, Object> deviceInfo = selectDeviceInfoById(device.getId());
+ //���������������������������
+ QueryWrapper<OrganizationUnitAlarm> queryOrganizationVersionWrapper = new QueryWrapper<>();
+ queryOrganizationVersionWrapper.eq("organization_id",orgId);
+ queryOrganizationVersionWrapper.eq("version_id",device.getDeviceVersionId());
+ 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",device.getDeviceVersionId());
+ queryVersionSensorUnitWrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<VersionSensorUnit> versionSensorUnits = versionSensorUnitMapper.selectList(queryVersionSensorUnitWrapper);
+ if(!ObjectUtils.isEmpty(versionSensorUnits)){
+ for (VersionSensorUnit versionSensorUnit : versionSensorUnits) {
+ OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm();
+ organizationUnitAlarm.setOrganizationId(orgId);
+ organizationUnitAlarm.setVersionId(device.getDeviceVersionId());
+ organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode());
+ organizationUnitAlarm.setUnitKey(versionSensorUnit.getUnitKey());
+ organizationUnitAlarmMapper.insert(organizationUnitAlarm);
+ }
+ }
+ }
//������������������������redis
- RedisUtil.del("device_" + device.getMac());
- RedisUtil.set("device_" + device.getMac(), deviceInfo);
+ String mac = device.getMac();
+ //���redis���������������������
+ delDeviceInfoFromRedis(mac);
+ //������������������redis
+ setDeviceInfoToRedis(mac, deviceInfo);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
- content.append("������������������").append(device.getName()).append("���").append("mac���").append(device.getMac());
+ content.append("������������������").append(device.getName()).append("���").append("mac���").append(mac);
logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE);
}
@@ -100,8 +165,24 @@
deviceMapper.update(null, updateWrapper);
Device device = deviceMapper.selectById(deviceId);
String mac = device.getMac();
- //������redis
- RedisUtil.del("device_" + mac);
+ //���redis���������������������
+ delDeviceInfoFromRedis(mac);
+ //���������������������������
+ Integer versionId = device.getDeviceVersionId();
+ Integer organizationId = device.getOrganizationId();
+ QueryWrapper<Device> queryOrganizationVersionWrapper = new QueryWrapper<>();
+ queryOrganizationVersionWrapper.eq("organization_id",organizationId);
+ queryOrganizationVersionWrapper.eq("device_version_id",versionId);
+ queryOrganizationVersionWrapper.eq("is_delete",Constants.NOT_DELETE);
+ List<Device> devices = deviceMapper.selectList(queryOrganizationVersionWrapper);
+ if(ObjectUtils.isEmpty(devices)){//������������������������������������������������������
+ UpdateWrapper deleteWrapper = new UpdateWrapper();
+ deleteWrapper.eq("organization_id",organizationId);
+ deleteWrapper.eq("version_id",versionId);
+ deleteWrapper.eq("is_delete",Constants.NOT_DELETE);
+ deleteWrapper.set("is_delete",Constants.DELETE);
+ organizationUnitAlarmMapper.update(null,deleteWrapper);
+ }
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -116,10 +197,11 @@
Device oldDevice = deviceMapper.selectById(deviceId);
deviceMapper.updateById(device);
String mac = deviceMapper.selectById(deviceId).getMac();
- //������redis
- RedisUtil.del("device_" + mac);
+ //���redis���������������������
+ delDeviceInfoFromRedis(mac);
Map<String, Object> deviceInfo = selectDeviceInfoById(deviceId);
- RedisUtil.set("device_" + mac, deviceInfo);
+ //������������������redis
+ setDeviceInfoToRedis(mac, deviceInfo);
//������������������
HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
StringBuilder content = new StringBuilder();
@@ -249,7 +331,7 @@
@Override
public Map<String, Object> selectDeviceInfoById(Integer deviceId) {
String mac = deviceMapper.selectById(deviceId).getMac();
- Map<String, Object> deviceInfo = (Map<String, Object>) RedisUtil.get("device_" + mac);
+ Map<String, Object> deviceInfo = getDeviceInfoFromRedis(mac);
//������redis������
if (deviceInfo != null) {
return deviceInfo;
@@ -317,7 +399,7 @@
mpInfo.put("name", monitorPoint.getName());
deviceInfo.put("monitorPoint", mpInfo);
- RedisUtil.set("device_" + mac, deviceInfo);
+ setDeviceInfoToRedis(mac, deviceInfo);
return deviceInfo;
}
@@ -335,4 +417,30 @@
return monitorPointMapper.selectMaps(queryWrapper);
}
+ @Override
+ public Map<String, Object> getDeviceByMac(String mac) {
+ Map<String, Object> deviceInfo = getDeviceInfoFromRedis(mac);
+ if (deviceInfo == null) {
+ QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("mac", mac).eq("is_delete", Constants.NOT_DELETE);
+ Device device = deviceMapper.selectOne(queryWrapper);
+ if (device != null) {
+ deviceInfo = selectDeviceInfoById(device.getId());
+ setDeviceInfoToRedis(mac, deviceInfo);
+ }
+ }
+ return deviceInfo;
+ }
+
+ @Override
+ public Map<String, Object> adjustDeviceData(Map<String, Object> deviceData, Map<String, Object> deviceInfo) {
+ return null;
+ }
+
+ @Override
+ public Map<String, Object> judgeDeviceState(Map<String, Object> deviceData, Map<String, Object> deviceInfo) {
+ return null;
+ }
+
+
}
--
Gitblit v1.8.0