心跳修改状态

huimv-env-input/src/main/java/com/huimv/env/input/server/EnvInputServerHandler.java

@@ -205,7 +205,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
         }
     }
 
-    private  synchronized void saveBeforeElectric2(String askText, String[] dataArray, ChannelHandlerContext ctx) {
+    private  synchronized void saveBeforeElectric2(String askText, String[] dataArray, ChannelHandlerContext ctx) throws IOException {
 
         String gateWayCode = dataArray[2];
         String  terminalCode = dataArray[3];
@@ -214,7 +214,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
         String eleData = dataArray[5];
         Date now = new Date();
 
-        try {
+//        try {
             PortChangeData portChangeData = portChangeDataService.getOne(new QueryWrapper<PortChangeData>().eq("terminal_port_code", gateWayCode + terminalCode + terminalPortCode).eq("num", num));
             if (ObjectUtils.isEmpty(portChangeData)) {
                 portChangeData = new PortChangeData();
@@ -250,10 +250,10 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
                     terminalPortService.updateById(deviceCode);
                 }
             }
-        }catch (Exception e){
-            log.error(String.format("点位查询失败--> %s" ,askText));
-            log.error(e);
-        }
+//        }catch (Exception e){
+//            log.error(String.format("点位查询失败--> %s" ,askText));
+//            log.error(e);
+//        }
     }
     private int getStatusEle2(PortChangeData portChangeData) {
         // 前有功功率	前无功功率	前视在功率  +  前 128个电流值
@@ -381,7 +381,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
         int[] splitBeforePower = Arrays.stream(dataArray[6].split(",")).mapToInt(Integer::parseInt).toArray();
         Date now = new Date();
 
-        try {
+
             PortChangeData portChangeData = portChangeDataService.getOne(new QueryWrapper<PortChangeData>().eq("terminal_port_code", gateWayCode + terminalCode + terminalPortCode).eq("num", num));
             if (ObjectUtils.isEmpty(portChangeData)) {
                 portChangeData = new PortChangeData(gateWayCode + terminalCode + terminalPortCode,gateWayCode + terminalCode ,gateWayCode,
@@ -430,10 +430,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
                     log.error(e);
                 }
             }
-        }catch (Exception e){
-            log.error(String.format("点位查询失败--> %s" ,askText));
-            log.error(e);
-        }
+
     }
     private void saveWarning3(String gateWayCode,String terminaCode,String terminalPortCode ,TerminalPort terminalPort,String line,Date now ) throws IOException {
 

huimv-env-input/src/main/java/com/huimv/env/input/timer/ElePostTimer.java

@@ -55,8 +55,8 @@ public class ElePostTimer {
     private IBasePigpenService basePigpenService;
 
 //    @Scheduled(cron = "0 0 0/1 * * ? ")
-    @Scheduled(cron = "0 * * * * ? ")
-//    @GetMapping("/test")
+//    @Scheduled(cron = "0 * * * * ? ")
+    @GetMapping("/test")
     public void  gateWayImport() throws IOException {
         System.out.println("----网关传输开始----");
         List<Gateway> gateways = baseFarmService.getUploadFarm();
@@ -77,8 +77,8 @@ public class ElePostTimer {
     }
 
 
-    @Scheduled(cron = "5 * * * * ? ")
-//    @GetMapping("/test1")
+//    @Scheduled(cron = "5 * * * * ? ")
+    @GetMapping("/test1")
     public void  trackImport() throws IOException {
         System.out.println("----心跳传输开始----");
         List<Gateway> gateways = baseFarmService.getUploadFarm();
@@ -91,8 +91,8 @@ public class ElePostTimer {
 
     }
 
-    @Scheduled(cron = "10 * * * * ? ")
-//    @GetMapping("/test2")
+//    @Scheduled(cron = "10 * * * * ? ")
+    @GetMapping("/test2")
     public void  dataImport() throws IOException {
         System.out.println("----流水传输开始----");
         List<Gateway> gateways = baseFarmService.getUploadFarm();