修改报警使能。

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/service/impl/SprayTimeServiceImpl.java

@@ -31,26 +31,23 @@ public class SprayTimeServiceImpl implements ISprayTimeService {
     public String getSprayTimeByDeviceCode(String deviceCode) {
         EnvSprayTimeEntity envSprayTimeEntity = new EnvSprayTimeEntity();
         envSprayTimeEntity.setDeviceCode(deviceCode);
-        System.out.println("envSprayTimeEntity="+envSprayTimeEntity);
         Example<EnvSprayTimeEntity> example = Example.of(envSprayTimeEntity);
         List<EnvSprayTimeEntity> envSprayTimeEntityList = envSprayTimeEntityRepo.findAll(example);
-        System.out.println("envSprayTimeEntityList.size()="+envSprayTimeEntityList.size());
         StringBuilder timeBuilder = new StringBuilder();
         int a=0;
         for(EnvSprayTimeEntity sprayTimeEntity:envSprayTimeEntityList){
             //开始时间(分秒)
             if(sprayTimeEntity.getOpenTime() != null && sprayTimeEntity.getOpenTime().trim().length() > 0){
-                System.out.println("sprayTimeEntity.getOpenTime()="+sprayTimeEntity.getOpenTime());
                 if(timeBuilder.length()>0){
                     timeBuilder.append(",");
                 }
-                timeBuilder.append(sprayTimeEntity.getOpenTime());
+                String[] sprayTimeArray = sprayTimeEntity.getOpenTime().split(":");
+                timeBuilder.append(sprayTimeArray[0]+sprayTimeArray[1]);
             }else{
                 log.error("开始时间为null或为空.");
             }
             //持续时间
             if(sprayTimeEntity.getDuration() != null && sprayTimeEntity.getDuration() > 0){
-                System.out.println("sprayTimeEntity.getDuration()="+sprayTimeEntity.getDuration());
                 if(timeBuilder.length()>0){
                     timeBuilder.append(",");
                 }
@@ -60,16 +57,13 @@ public class SprayTimeServiceImpl implements ISprayTimeService {
             }
             //开关时长
             if(sprayTimeEntity.getOpenMode() != null && sprayTimeEntity.getOpenMode().trim().length() > 0){
-                System.out.println("sprayTimeEntity.getOpenMode()="+sprayTimeEntity.getOpenMode());
                 if(timeBuilder.length()>0){
                     timeBuilder.append(",");
                 }
                 String openMode = sprayTimeEntity.getOpenMode();
-                System.out.println("openMode="+openMode);
                 String[] openModeArray = openMode.split(",");
                 //分钟-->秒钟
                 timeBuilder.append(String.valueOf(Integer.parseInt(openModeArray[0])*60)+","+String.valueOf(Integer.parseInt(openModeArray[1])*60));
-                System.out.println("timeBuilder="+timeBuilder.toString());
             }else{
                 log.error("开始时长为null或为空.");
             }

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

@@ -270,7 +270,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
             System.out.println("##获取报警使能请求-未注册设备 idCode=" + idCode);
             return;
         }
-        String answerText = "hm+115+14+2(111)2(111)2(111)2(111)+0+4+end";
+        String answerText = "hm+"+idCode+"+14+2(111)2(111)2(111)2(111)+0+4+end";
         log.info(">>获取报警使能请求-应答数据>>" + answerText);
         answerCmd(answerText, ctx);
     }
@@ -317,7 +317,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
         JSONObject configJo = sprayConfigService.getSprayConfigByDeviceCode(deviceCode, farmCode);
         int runMode = configJo.getInteger("runMode");
         int deviceStatus = configJo.getInteger("deviceStatus");
-        int timeInterval = configJo.getInteger("timeInterval");
+        int timeInterval = configJo.getInteger("timeInterval") * 60;
         //读取定时时间配置表数据
         String sprayTime = sprayTimeService.getSprayTimeByDeviceCode(deviceCode);
 //        String answerText = "hm+"+deviceCode+"+6+1+1+0101,60,10,10,0202,60,10,10,0303,60,10,10,0404,60,10,10+60+6+end";