From d10235124e675103c1a27fb5aeff337493413cc2 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Thu, 22 Aug 2019 16:57:50 +0800
Subject: [PATCH] Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

---
 src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java |   30 +++++++++++++++++++-----------
 1 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
index 1de644f..4dce55d 100644
--- a/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/DeviceVersionServiceImpl.java
@@ -1,20 +1,24 @@
 package com.moral.service.impl;
 
-import com.moral.common.bean.PageBean;
-import com.moral.common.util.MyBatisBaseMapUtil;
-import com.moral.entity.DeviceVersion;
-import com.moral.entity.DeviceVersionSensor;
-import com.moral.entity.Sensor;
-import com.moral.mapper.DeviceVersionMapper;
-import com.moral.mapper.DeviceVersionSensorMapper;
-import com.moral.service.DeviceVersionService;
-import org.springframework.stereotype.Service;
-import tk.mybatis.mapper.entity.Example;
-import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.moral.common.bean.PageBean;
+import com.moral.common.util.MyBatisBaseMapUtil;
+import com.moral.common.util.RedisUtils;
+import com.moral.entity.DeviceVersion;
+import com.moral.entity.DeviceVersionSensor;
+import com.moral.mapper.DeviceVersionMapper;
+import com.moral.mapper.DeviceVersionSensorMapper;
+import com.moral.service.DeviceVersionService;
+
+import tk.mybatis.mapper.entity.Example;
 
 @Service
 public class DeviceVersionServiceImpl implements DeviceVersionService {
@@ -63,11 +67,15 @@
 
             }
       }
+      
+      @Resource
+      private RedisUtils redisUtils;
       @Override
       public void versionSensorConfig(Integer deviceVersionId, Integer[] sensorIds){
             Example example = new Example(DeviceVersionSensor.class);
             example.or().andEqualTo("deviceVersionId",deviceVersionId);
             deviceVersionSensorMapper.deleteByExample(example);
+            redisUtils.remove("deviceVersion_" + deviceVersionId);
             if(sensorIds!=null && sensorIds.length >0){
                   List<DeviceVersionSensor> deviceVersionSensorList = new ArrayList<DeviceVersionSensor>();
                   for(int sensorId:sensorIds){

--
Gitblit v1.8.0