模块整理

@@ -144,6 +144,10 @@ public class CameraConfig implements OperatingDataType{
      */
     private Integer stopTriggeringConditions;
 
+    /**
+     * 是否需要发送鱼群规模识别记录
+     */
+    private Boolean ifSendFishSchoolSize;
 
     public CameraConfig creteDefault()
     {
@@ -177,6 +181,7 @@ public class CameraConfig implements OperatingDataType{
         this.collectionScale = 5;
         this.scaleStep = 60;
         this.stopTriggeringConditions = 30;
+        this.ifSendFishSchoolSize = false;
         return this;
     }
 

@@ -265,22 +265,25 @@ public class FishGroupImageRecognitionService {
                 if(OperatingData.cameraData.getFishSchoolSize()!=grade)
                 {
                     OperatingData.cameraData.setFishSchoolSize(grade);
-                    int finalGrade = grade;
-                    ScheduledConfig.scheduler.schedule(() -> {
-
-                        String nowtime = DateUtils.getTime();
-                        String[] ss = OperatingData.cameraConfig.getFishSchoolSizeConfigString();
-                        String fishSchoolSizeStr = ss[finalGrade];
-                        StringBuffer stringBuffer = new StringBuffer();
-                        stringBuffer.append(nowtime);
-                        stringBuffer.append(" ");
-                        stringBuffer.append(fishSchoolSizeStr);
+                    if(OperatingData.cameraConfig.getIfSendFishSchoolSize())
+                    {
+                        int finalGrade = grade;
+                        ScheduledConfig.scheduler.schedule(() -> {
+
+                            String nowtime = DateUtils.getTime();
+                            String[] ss = OperatingData.cameraConfig.getFishSchoolSizeConfigString();
+                            String fishSchoolSizeStr = ss[finalGrade];
+                            StringBuffer stringBuffer = new StringBuffer();
+                            stringBuffer.append(nowtime);
+                            stringBuffer.append(" ");
+                            stringBuffer.append(fishSchoolSizeStr);
 //                        stringBuffer.append("，当前档位：");
 //                        stringBuffer.append(null==OperatingData.cameraData.getNowGear()?0:OperatingData.cameraData.getNowGear());
 //                        stringBuffer.append("档");
-                        InitService.dateListenService.reportIntelligentFeeding(stringBuffer.toString());
+                            InitService.dateListenService.reportIntelligentFeeding(stringBuffer.toString());
 
-                    },0, TimeUnit.SECONDS);
+                        },0, TimeUnit.SECONDS);
+                    }
                 }
 
             }

@@ -3,7 +3,6 @@ package com.zhonglai.luhui.smart.feeder.service;
 import com.ruoyi.common.utils.DateUtils;
 import com.zhonglai.luhui.smart.feeder.config.OperatingData;
 import com.zhonglai.luhui.smart.feeder.config.ScheduledConfig;
-import com.zhonglai.luhui.smart.feeder.dto.ModbusDto;
 import com.zhonglai.luhui.smart.feeder.dto.mqtt.Condata;
 import com.zhonglai.luhui.smart.feeder.service.device.SerialPortService;
 import com.zhonglai.luhui.smart.feeder.util.FeederCommd06ResponseType;
@@ -27,7 +26,7 @@ public class ScaleStepMethodService {
 
     public void run()
     {
-        scheduledFuture = ScheduledConfig.scheduler.scheduleAtFixedRate(() -> {
+        scheduledFuture = ScheduledConfig.scheduler.scheduleWithFixedDelay(() -> {
             if( OperatingData.cameraData.getScaleAreaList().size()==0)
             {
                 return;
@@ -87,7 +86,7 @@ public class ScaleStepMethodService {
             }
 
             //如果鱼群急剧增加，。。。
-            if (OperatingData.cameraData.getScaleAreaSumMax()-((OperatingData.cameraData.getScaleAreaSumMax()*OperatingData.cameraConfig.getStopTriggeringConditions())/100)-sum>=0)
+            if (OperatingData.cameraData.getScaleAreaSumMax()-((OperatingData.cameraData.getScaleAreaSumMax()*OperatingData.cameraConfig.getStopTriggeringConditions())/100)-sum<=0)
             {
                 stringBuffer.append("发现鱼群急剧增加，");