修复结合部分代码

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/IClientDataPacketService.java

@@ -5,5 +5,5 @@ import java.text.ParseException;
 public interface IClientDataPacketService {
 
     // 解析客户端数据包
-    public String parseClientSendPacket(String clientMessage) throws ParseException;
+    public String handleClientSendPacket(String clientMessage) throws ParseException;
 }

ear_tag/huimv-eartag-manager/src/main/java/com/huimv/eartag/manager/service/impl/ClientDataPacketServiceImpl.java

@@ -25,9 +25,10 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
     private SendPackageService sendPackageService;
 
     @Override
-    public String parseClientSendPacket(String clientMessageTxt) throws ParseException {
+    public String handleClientSendPacket(String clientMessageTxt) throws ParseException {
         if (clientMessageTxt == null || clientMessageTxt.isEmpty()) {
-
+            log.error("本地提交数据包为空.");
+            return null;
         }
         String matcher = "[+]";
 //        String matcher = "\\+";

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

@@ -27,28 +27,62 @@ public class ParseClientMessageTest {
     @Test
     public void testParseClientMessage() throws ParseException {
         String clientMessage = "hm+123456789012345+1+7+end";
-        String t = iParseClientPacket.parseClientSendPacket(clientMessage);
+        String t = iParseClientPacket.handleClientSendPacket(clientMessage);
         System.out.println("t>>" + t);
     }
 
     @Test
     public void testHandleEartagData() throws ParseException {
         String clientMessage = "hm+0+6+1.0+002d4895+668519+89+2100+10902+1550+2+84+20201230175903+9+end";
-        String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+        String t = iParseClientPacket.handleClientSendPacket(clientMessage).toString();
         System.out.println("测试结果>>" + t);
     }
 
     @Test
     public void testGetServerDateTime() throws ParseException {
     String clientMessage = "hm+158+2+9+end";
-    String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+    String t = iParseClientPacket.handleClientSendPacket(clientMessage).toString();
         System.out.println("测试结果>>"+t);
     }
 
     @Test
     public void testGetDeviceId() throws ParseException {
         String clientMessage = "hm+123456789012345+1+7+end";
-        String t = iParseClientPacket.parseClientSendPacket(clientMessage).toString();
+        String t = iParseClientPacket.handleClientSendPacket(clientMessage).toString();
+        System.out.println("测试结果>>"+t);
+    }
+
+    /**
+     * @Method      : 'testHandleEartagTemperature'
+     * @Description : 测试网关上传温度
+     * @Params      : []
+     * @Return      : void
+     * 
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/18       
+     * @Time        : 12:00
+     */
+    @Test
+    public void testHandleEartagTemperature() throws ParseException {
+        String clientMessage = "hm+158+4+1+289+20170208152300+6+end";
+        String t = iParseClientPacket.handleClientSendPacket(clientMessage).toString();
+        System.out.println("测试结果>>"+t);
+    }
+
+    /**
+     * @Method      : testHandleEartagTemperature
+     * @Description : 测试网关上传湿度
+     * @Params      : []
+     * @Return      : void
+     *
+     * @Author      : ZhuoNing
+     * @Date        : 2021/1/18
+     * @Time        : 12:00
+     */
+    @Test
+    public void testHandleEartagDempness() throws ParseException {
+        String clientMessage = "hm+158+5+1+289+20170208152300+6+end";
+        String t = iParseClientPacket.handleClientSendPacket(clientMessage).toString();
         System.out.println("测试结果>>"+t);
     }
 }