全部代码002

huimv-massage-service/huimv-massage-service.iml

@@ -38,6 +38,9 @@
     <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.5" level="project" />
     <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid-spring-boot-starter:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.alibaba:druid:1.2.5" level="project" />
+    <orderEntry type="library" name="Maven: javax.annotation:javax.annotation-api:1.3.2" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:2.5.3" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.5.3" level="project" />

huimv-massage-service/src/main/java/com/huimv/socketservice/sendmassage/SendWork.java

@@ -61,7 +61,7 @@ public class SendWork {
             String result = client.send(params);
             String balance = client.balance();
             System.out.println("222通知号码" + result + balance);
-
+//
             AlarmHistoryEntity alarmHistoryEntity = new AlarmHistoryEntity();
             alarmHistoryEntity.setAlarmType(2);
             alarmHistoryEntity.setBeginTime(new Date());

huimv-massage-service/src/main/java/com/huimv/socketservice/socket/eartagrecive/service/impl/ClientDataPacketServiceImpl.java

@@ -59,7 +59,7 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
             heartBeatService.save(heartBeatEntity);
             System.out.println("处理1命令");
             //直接存储数据
-            return "hm+ok";
+            return sendPackageService.getServerDateTime(clientMessageArray);
         } else if (Integer.parseInt(cmd) == 2) {   //relay没有启动--直接报警
             HeartBeatEntity heartBeatEntity = new HeartBeatEntity();
             heartBeatEntity.setCmd(Integer.valueOf(cmd));
@@ -71,7 +71,16 @@ public class ClientDataPacketServiceImpl implements IClientDataPacketService {
 
             System.out.println("处理2命令");
             return sendPackageService.getServerDateTime(clientMessageArray);
-        } else {
+        } else if (Integer.parseInt(cmd) == 3) {   //relay没有启动--直接报警
+            HeartBeatEntity heartBeatEntity = new HeartBeatEntity();
+            heartBeatEntity.setCmd(Integer.valueOf(cmd));
+            heartBeatEntity.setFarmCode(Integer.valueOf(clientMessageArray[3]));
+            heartBeatEntity.setCreateTime(new Date());
+            heartBeatEntity.setHeader(clientMessageArray[0]);
+            heartBeatService.save(heartBeatEntity);
+            System.out.println("处理3命令");
+            return sendPackageService.getServerDateTime(clientMessageArray);
+        }  else {
             log.error("出错：当前命令cmd>>[" + cmd + "]未做任何处理.");
             return  "null";
         }

huimv-massage-service/src/main/java/com/huimv/socketservice/timmertask/DeleteOldData.java

@@ -45,7 +45,7 @@ public class DeleteOldData {
         lambdaQueryWrapper.between(HeartBeatEntity::getCreateTime, settingTimesBeforeTowday, settingTimesBeforeOneday);   //在使用的牧场
         List<Integer> collect = heartBeatDao.selectObjs(lambdaQueryWrapper).stream().map(o -> (Integer) o).collect(Collectors.toList());
         heartBeatService.removeByIds(collect);
-
+//
     }
 
 

huimv-massage-service/src/main/java/com/huimv/socketservice/timmertask/SendAlarmMassage.java

@@ -181,4 +181,4 @@ public class SendAlarmMassage {
         }
     }
 
-}
+}//