From 3ddfa12fbc43e80e99e4959fbac8881eaa8e3ca3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 17 Jan 2022 16:22:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_

---
 screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java |   45 ++++++++++++++++++++++++++++++++++++---------
 1 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
index e22c1ea..e4350df 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/DeviceAdjustValueServiceImpl.java
@@ -7,9 +7,11 @@
 import com.moral.api.entity.Device;
 import com.moral.api.entity.DeviceAdjustValue;
 import com.moral.api.entity.Sensor;
+import com.moral.api.entity.SpecialDevice;
 import com.moral.api.mapper.DeviceAdjustValueMapper;
 import com.moral.api.mapper.DeviceMapper;
 import com.moral.api.mapper.SensorMapper;
+import com.moral.api.mapper.SpecialDeviceMapper;
 import com.moral.api.service.DeviceAdjustValueService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.moral.api.util.LogUtils;
@@ -47,10 +49,10 @@
     private DeviceMapper deviceMapper;
 
     @Autowired(required = false)
-    private SensorMapper sensorMapper;
+    private SpecialDeviceMapper specialDeviceMapper;
 
-    @Autowired
-    LogUtils logUtils;
+    @Autowired(required = false)
+    private SensorMapper sensorMapper;
 
     @Autowired
     RedisTemplate redisTemplate;
@@ -72,7 +74,10 @@
         QueryWrapper<Device> wrapper_device = new QueryWrapper<>();
         wrapper_device.eq("is_delete",Constants.NOT_DELETE);
         wrapper_device.eq("mac",deviceAdjustValue.getMac());
-        if (deviceMapper.selectCount(wrapper_device)==0){
+        QueryWrapper<SpecialDevice> wrapper_specialDevice = new QueryWrapper<>();
+        wrapper_specialDevice.eq("is_delete",Constants.NOT_DELETE);
+        wrapper_specialDevice.eq("mac",deviceAdjustValue.getMac());
+        if (deviceMapper.selectCount(wrapper_device)==0 && specialDeviceMapper.selectCount(wrapper_specialDevice)==0){
             resultMap.put("code",ResponseCodeEnum.DEVICE_IS_NULL.getCode());
             resultMap.put("msg",ResponseCodeEnum.DEVICE_IS_NULL.getMsg());
             return resultMap;
@@ -85,11 +90,11 @@
             resultMap.put("msg",ResponseCodeEnum.SENSOR_IS_NOT_EXIST.getMsg());
             return resultMap;
         }
-        //deviceAdjustValueMapper.insert(deviceAdjustValue);
+        deviceAdjustValueMapper.insert(deviceAdjustValue);
         //������������������
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String content = "���������"+deviceAdjustValue.getMac()+"������"+deviceAdjustValue.getSensorCode()+"���������"+deviceAdjustValue.getStartTime()+"���"+deviceAdjustValue.getEndTime()+"���������������:"+";";
-        //logUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
+        LogUtils.saveOperationForManage(request,content,Constants.INSERT_OPERATE_TYPE);
         //������������
         refreshCache(deviceAdjustValue.getMac());
         resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode());
@@ -167,7 +172,7 @@
                 content = content+"������������:"+deviceAdjustValueOld.getValue()+"->"+map.get(key)+";";
             }
         }
-        logUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
+        LogUtils.saveOperationForManage(request,content,Constants.UPDATE_OPERATE_TYPE);
         //������������
         refreshCache(deviceAdjustValueOld.getMac());
         resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
@@ -199,7 +204,7 @@
         //������������������
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String content = "���������"+deviceAdjustValue.getMac()+"������"+deviceAdjustValue.getSensorCode()+"���������"+deviceAdjustValue.getStartTime()+"���"+deviceAdjustValue.getEndTime()+"���������������:"+";";
-        logUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
+        LogUtils.saveOperationForManage(request,content,Constants.DELETE_OPERATE_TYPE);
         //������������
         refreshCache(deviceAdjustValue.getMac());
         resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
@@ -241,6 +246,26 @@
         return resultMap;
     }
 
+    @Override
+    public Map<String, Object> refreshRedis() {
+        Map<String,Object> resultMap = new HashMap<>();
+        QueryWrapper<DeviceAdjustValue> wrapper_mac = new QueryWrapper<>();
+        wrapper_mac.eq("is_delete",Constants.NOT_DELETE);
+        wrapper_mac.select("DISTINCT mac");
+        List<DeviceAdjustValue> deviceAdjustValues = deviceAdjustValueMapper.selectList(wrapper_mac);
+        for (DeviceAdjustValue deviceAdjustValue:deviceAdjustValues) {
+            //������������
+            refreshCache(deviceAdjustValue.getMac());
+        }
+        resultMap.put("code",ResponseCodeEnum.SUCCESS.getCode());
+        resultMap.put("msg",ResponseCodeEnum.SUCCESS.getMsg());
+        return resultMap;
+    }
+
+    public void refreshRedisAll(){
+        refreshRedis();
+    }
+
     private Map<String,Object> getDeviceAdjustValueFromDB(String mac){
         QueryWrapper<DeviceAdjustValue> wapper_redis = new QueryWrapper<>();
         wapper_redis.eq("mac",mac);
@@ -276,7 +301,9 @@
         //������������
         redisTemplate.delete("adjust_"+mac);
         //������������
-        redisTemplate.opsForHash().putAll("adjust_"+mac,deviceAdjustValueMap);
+        if (!ObjectUtils.isEmpty(deviceAdjustValueMap)){
+            redisTemplate.opsForHash().putAll("adjust_"+mac,deviceAdjustValueMap);
+        }
     }
 
 }

--
Gitblit v1.8.0