添加处理温度和湿度功能

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/service/impl/ReceivePackageSerivce.java

@@ -1,8 +1,14 @@
 package com.huimv.eartag.monitor.service.impl;
 
 import com.huimv.common.date.DateUtil;
+import com.huimv.eartag.monitor.dao.EartagDampnessMapper;
+import com.huimv.eartag.monitor.dao.EartagTemperatureMapper;
+import com.huimv.eartag.monitor.pojo.EartagDampness;
 import com.huimv.eartag.monitor.pojo.EartagData;
+import com.huimv.eartag.monitor.pojo.EartagTemperature;
+import com.huimv.eartag.monitor.service.EartagDampnessService;
 import com.huimv.eartag.monitor.service.EartagDataService;
+import com.huimv.eartag.monitor.service.EartagTemperatureService;
 import com.huimv.eartag.monitor.utils.Const;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +30,15 @@ public class ReceivePackageSerivce {
 
     @Autowired
     private EartagDataService eartagDataService;
+    @Autowired
+    private EartagTemperatureMapper temperatureMapper;
+    @Autowired
+    private EartagTemperatureService temperatureService;
+    @Autowired
+    private EartagDampnessMapper dampnessMapper;
+    @Autowired
+    private EartagDampnessService dampnessService;
+
     /**
      * @Method      : handleEartagData
      * @Description : 处理耳标数据
@@ -73,7 +88,7 @@ public class ReceivePackageSerivce {
         eartagData.setMLW(commandTail);
         // 保存耳标数据
         eartagDataService.add(eartagData);
-        log.info(Const.EARTAG_SAVE_SUCCESS);
+        log.info(Const.SAVE_EARTAG_SUCCESS);
         StringBuilder returnSb = new StringBuilder();
 //        return returnSb.append("hm").append("+").append(6).append("+").append(0).append("+").append(6).append("+").append("end").toString();
         return "hm+6+0+6+end";
@@ -81,7 +96,7 @@ public class ReceivePackageSerivce {
 
     /**
      * @Method      : _handleEartagDampness
-     * @Description : 处理耳标湿度
+     * @Description : 处理网关湿度
      * @Params      : [clientMessageArray]
      * @Return      : java.lang.String
      *
@@ -89,15 +104,33 @@ public class ReceivePackageSerivce {
      * @Date        : 2021/1/15
      * @Time        : 17:47
      */
-    public String handleEartagDampness(String[] clientMessageArray) {
-//        String value = clientMessageArray[];
-
+    public String handleEartagDampness(String[] clientMessageArray) throws ParseException {
+        String header = clientMessageArray[0];
+        String deviceId = clientMessageArray[1];
+        String cmd = clientMessageArray[2];
+        String serialNo = clientMessageArray[3];
+        String value = clientMessageArray[4];
+        String timestamp = clientMessageArray[5];
+        String checkCode = clientMessageArray[6];
+        String tail = clientMessageArray[7];
+        EartagDampness eartagDampnessPojo = new EartagDampness();
+        eartagDampnessPojo.setHeader(header);
+        eartagDampnessPojo.setDeviceId(Integer.parseInt(deviceId));
+        eartagDampnessPojo.setCmd(Integer.parseInt(cmd));
+        eartagDampnessPojo.setSerialNo(Integer.parseInt(serialNo));
+        eartagDampnessPojo.setValue(Double.parseDouble(value));
+        eartagDampnessPojo.setCreateDate(DateUtil.parseDateTime(DateUtil.buildDateTimeString(timestamp)));
+        eartagDampnessPojo.setCheckNumber(Integer.parseInt(checkCode));
+        eartagDampnessPojo.setTail(tail);
+        dampnessMapper.insert(eartagDampnessPojo);
+//        dampnessService.add(eartagDampnessPojo);
+        log.info(Const.SAVE_DAMPNESS_SUCCESS);
         return "hm+5+0+8+end";
     }
 
     /**
      * @Method      : _handleEartagTemperature
-     * @Description : 处理耳标温度
+     * @Description : 处理网关温度
      * @Params      : [clientMessageArray]
      * @Return      : java.lang.String
      *
@@ -105,9 +138,27 @@ public class ReceivePackageSerivce {
      * @Date        : 2021/1/15
      * @Time        : 17:46
      */
-    public String handleEartagTemperature(String[] clientMessageArray) {
-//        String value = clientMessageArray[];
-
+    public String handleEartagTemperature(String[] clientMessageArray) throws ParseException {
+        String header = clientMessageArray[0];
+        String deviceId = clientMessageArray[1];
+        String cmd = clientMessageArray[2];
+        String serialNo = clientMessageArray[3];
+        String value = clientMessageArray[4];
+        String timestamp = clientMessageArray[5];
+        String checkCode = clientMessageArray[6];
+        String tail = clientMessageArray[7];
+        EartagTemperature EartagTemperaturePojo = new EartagTemperature();
+        EartagTemperaturePojo.setHeader(header);
+        EartagTemperaturePojo.setDeviceId(Integer.parseInt(deviceId));
+        EartagTemperaturePojo.setCmd(Integer.parseInt(cmd));
+        EartagTemperaturePojo.setSerialNo(Integer.parseInt(serialNo));
+        EartagTemperaturePojo.setValue(Double.parseDouble(value));
+        EartagTemperaturePojo.setCreateDate(DateUtil.parseDateTime(DateUtil.buildDateTimeString(timestamp)));
+        EartagTemperaturePojo.setCheckNumber(Integer.parseInt(checkCode));
+        EartagTemperaturePojo.setTail(tail);
+        temperatureMapper.insert(EartagTemperaturePojo);
+//        temperatureService.add(EartagTemperaturePojo);
+        log.info(Const.SAVE_TEMPERATURE_SUCCESS);
         return "hm+4+0+7+end";
     }
 }

ear_tag/huimv-eartag-monitor/src/main/java/com/huimv/eartag/monitor/utils/Const.java

@@ -2,5 +2,7 @@ package com.huimv.eartag.monitor.utils;
 
 //@Component
 public class Const {
-    public static final String EARTAG_SAVE_SUCCESS = "保存耳标数据成功";
+    public static final String SAVE_EARTAG_SUCCESS = "保存耳标数据成功";
+    public static final String SAVE_TEMPERATURE_SUCCESS = "保存温度数据成功";
+    public static final String SAVE_DAMPNESS_SUCCESS = "保存湿度数据成功";
 }

ear_tag/huimv-eartag-monitor/src/test/java/com/huimv/eartag/monitor/service/ParseClientMessageTest.java

@@ -44,10 +44,27 @@ public class ParseClientMessageTest {
         System.out.println("测试结果>>"+t);
     }
 
+    /**
+     * @Method      : testGetDeviceId
+     * @Description : 
+     * @Params      : []
+     * @Return      : void
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/18       
+     * @Time        : 11:07
+     */
     @Test
     public void testGetDeviceId() throws ParseException {
         String clientMessage = "hm+123456789012345+1+7+end";
         String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
         System.out.println("测试结果>>"+t);
     }
+
+    @Test
+    public void testHandleEartagTemperature() throws ParseException {
+        String clientMessage = "hm+158+4+1+289+20170208152300+6+end";
+        String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+        System.out.println("测试结果>>"+t);
+    }
 }