Add offset update in redis for updateTDLOffset interface in TDLDeviceController.

src/main/java/com/example/tdl/mapper/TDLDeviceMapper.java

@@ -2,7 +2,6 @@ package com.example.tdl.mapper;
 
 
 import com.example.tdl.domain.vo.*;
-import com.example.tdl.entity.TDLDataOffset;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

src/main/java/com/example/tdl/util/AlarmRule.java

 package com.example.tdl.util;
 
 import com.example.tdl.domain.vo.AlarmRuleVo;
-import com.example.tdl.domain.vo.ResultAlarmVo;
 import com.example.tdl.domain.vo.ResultBoschAlarmVo;
 import com.example.tdl.entity.TDLDataOffset;
-import com.example.tdl.service.AlarmService;
 import com.example.tdl.service.BoschAlarmService;
 import com.example.tdl.service.redis.AlarmRedisService;
 import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class AlarmRule {
+    private final static Logger logger = LoggerFactory.getLogger(AlarmRule.class);
 
     private static  Gson gson = new Gson();
 
@@ -96,4 +99,38 @@ public class AlarmRule {
             alarmRedisService.hmSet(topic,"TDL-" +TDLSN+"_" +alias,gson.toJson(alarmRuleVos));
         }
     }
+
+    public static void updateOffset(String topic, String TDLSN, String alias, Double offset,
+                                    AlarmRedisService alarmRedisService) {
+        try {
+            String hashKey = "TDL-" + TDLSN + "_" + alias;
+            /* Get alarm rule from redis */
+            Object hashValueObject = alarmRedisService.getHash(topic, hashKey);
+            List<AlarmRuleVo> alarmRuleList = gson.fromJson(hashValueObject.toString(),
+                    new TypeToken<ArrayList<AlarmRuleVo>>() {}.getType());
+            /* Update offset */
+            if (alarmRuleList != null && alarmRuleList.size() > 0) {
+                alarmRuleList.get(0).setOffset(offset);
+                /* Write back to redis */
+                alarmRedisService.hmSet(topic, hashKey, gson.toJson(alarmRuleList));
+            }
+        } catch (JsonSyntaxException e) {
+            logger.error("Update offset(" + alias + ") JsonSyntaxException: " + e.getMessage());
+        }
+    }
+
+    public static void updateOffset(String topic, String TDLSN, TDLDataOffset offset,
+                                    AlarmRedisService alarmRedisService) {
+        if (offset == null)
+            return;
+
+        /* 更新温度校准值 */
+        if (offset.getTempOffset() != null) {
+            updateOffset(topic, TDLSN, "T", offset.getTempOffset(), alarmRedisService);
+        }
+        /* 更新湿度校准值 */
+        if (offset.getHumidityOffset() != null) {
+            updateOffset(topic, TDLSN, "h", offset.getHumidityOffset(), alarmRedisService);
+        }
+    }
 }

src/main/java/com/example/tdl/web/TDLDeviceController.java

@@ -7,7 +7,9 @@ import com.example.tdl.domain.dto.CommFeedback;
 import com.example.tdl.domain.vo.*;
 import com.example.tdl.entity.TDLDataOffset;
 import com.example.tdl.service.TDLDeviceService;
+import com.example.tdl.service.redis.AlarmRedisService;
 import com.example.tdl.service.redis.TokenRedisService;
+import com.example.tdl.util.AlarmRule;
 import com.google.gson.Gson;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -20,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
-import retrofit2.http.HTTP;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -41,6 +42,8 @@ public class TDLDeviceController {
     @Autowired
     private TokenRedisService tokenRedisService;
 
+    @Autowired
+    private AlarmRedisService alarmRedisService;
 
     @Autowired
     private I18nController  i18n;
@@ -292,8 +295,18 @@ public class TDLDeviceController {
         String offset = gson.toJson(updateTDLOffsetVo.getOffset(), TDLDataOffset.class);
         int a = tdlDeviceService.updateTDLOffset(updateTDLOffsetVo.getTdlSN(), offset);
         if (a>=0){
+            /* 更新Redis里面的offset信息 */
+            ResultTDLDeviceVo resultTDLDeviceVo = tdlDeviceService.getByTDLSN(updateTDLOffsetVo.getTdlSN());
+            if (resultTDLDeviceVo.getGatewaySN() != null && resultTDLDeviceVo.getGatewayType() != null) {
+                String topic = "TDL/"+resultTDLDeviceVo.getGatewayType()+"/" +resultTDLDeviceVo.getGatewaySN()+"/Data";
+                AlarmRule.updateOffset(topic, updateTDLOffsetVo.getTdlSN(),
+                        updateTDLOffsetVo.getOffset(), alarmRedisService);
                 fb.setCode(1);
                 fb.setMessage(i18n.getMessage(request,"updateTDLOffsetSuccess"));
+            } else {
+                fb.setCode(0);
+                fb.setMessage(i18n.getMessage(request,"TDLNotBoundGateway"));
+            }
         }else{
             fb.setCode(0);
             fb.setMessage(i18n.getMessage(request,"updateTDLOffsetFailure"));

src/main/resources/i18n/messages_en.properties

@@ -212,6 +212,7 @@ updateTDLCompanyFailure=Failed to allocate the sensor  to the company
 wrongTDLOffset=Offset of sensor cannot be empty
 updateTDLOffsetSuccess=Update TDL offset successfully
 updateTDLOffsetFailure=Update TDL offset failed
+TDLNotBoundGateway=TDL not bound to gateway
 warehouseName=Warehouse's name must not be null
 property=Warehouse's property must not be null
 wrongProperty=Please enter the correct property

src/main/resources/i18n/messages_zh_CN.properties

@@ -240,6 +240,7 @@ updateTDLCompanyFailure=\u4F20\u611F\u5668\u5206\u914D\u516C\u53F8\u5931\u8D25
 wrongTDLOffset=\u4F20\u611F\u5668\u6821\u51C6\u503C\u4E0D\u80FD\u4E3A\u7A7A
 updateTDLOffsetSuccess=\u4F20\u611F\u5668\u4FEE\u6539\u6821\u51C6\u503C\u6210\u529F
 updateTDLOffsetFailure=\u4F20\u611F\u5668\u4FEE\u6539\u6821\u51C6\u503C\u5931\u8D25
+TDLNotBoundGateway=\u4F20\u611F\u5668\u672A\u7ED1\u5B9A\u7F51\u5173
 #\u4ED3\u5E93
 warehouseName = \u4ED3\u5E93\u540D\u4E0D\u80FD\u4E3A\u7A7A
 property =\u4ED3\u5E93\u5C5E\u6027\u4E0D\u80FD\u4E3A\u7A7A