模块整理

@@ -13,4 +13,5 @@ public interface CacheService {
     boolean updateCache(Topic topic, ServerDto dto); //返回是否需要持久化
     boolean updateCache(Topic topic, ServerDto dto); //返回是否需要持久化
     IotDevice getIotDevice(String id);
     IotDevice getIotDevice(String id);
     IotTerminal getIotTerminal(String id);
     IotTerminal getIotTerminal(String id);
+    void sendMsg(String channel, Object message);
 }
 }

@@ -199,6 +199,11 @@ public class CacheServiceImpl implements CacheService {
         redisService.del(keys);
         redisService.del(keys);
     }
     }
 
 
+    //发送消息
+    public void sendMsg(String channel, Object message){
+        redisService.sendMsg( channel, message);
+    }
+
     /**
     /**
      * 获取缓存主机key
      * 获取缓存主机key
      * @param client_id
      * @param client_id

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
 
 
@@ -22,6 +23,11 @@ public class RedisService {
     @Resource
     @Resource
     private RedisTemplate<String,Object> redisTemplate;
     private RedisTemplate<String,Object> redisTemplate;
 
 
+    //发送消息
+    public void sendMsg(String channel, Object message){
+        redisTemplate.convertAndSend( channel, message);
+    }
+
 
 
     /**
     /**
      * @param key
      * @param key

@@ -93,6 +93,9 @@ public class MqttCallback implements MqttCallbackExtended {
                 terminalService.publish(TopicUtil.generateSendMessageTopic(desttopic),"1");
                 terminalService.publish(TopicUtil.generateSendMessageTopic(desttopic),"1");
                 return;
                 return;
             }
             }
+
+            cacheService.sendMsg(s.replaceAll("/",":"),new String(data));
+
             if("ONLINE".equals(topic.getTopicType().toUpperCase()))
             if("ONLINE".equals(topic.getTopicType().toUpperCase()))
             {
             {
                 topic.setPayloadtype("String");
                 topic.setPayloadtype("String");

@@ -49,7 +49,7 @@ mqtt:
   mqtt_usernames: 6_WP,12_BPQ,10_TLJ,NWDB_2023,WLJ_1,YWB_A700E,12_ZNZY
   mqtt_usernames: 6_WP,12_BPQ,10_TLJ,NWDB_2023,WLJ_1,YWB_A700E,12_ZNZY
   #订阅的topic
   #订阅的topic
   topics: ADD_POST,ALL_POST,DB_TOPIC_DISTRIBUTE,GET/+,online,PUT_REQ/+,READ_REQ/+
   topics: ADD_POST,ALL_POST,DB_TOPIC_DISTRIBUTE,GET/+,online,PUT_REQ/+,READ_REQ/+
-  sub_clientid: '866838067732715'
+  sub_clientid: '866838067733465'
   topicconfig: "/{{roleid}}/{{username}}/{{clientid}}/{{payloadtype}}/{{topicType}}/{{messageid}}"
   topicconfig: "/{{roleid}}/{{username}}/{{clientid}}/{{payloadtype}}/{{topicType}}/{{messageid}}"
   top_return_map: '{"PUT":"PUT_REQ","READ":"READ_REQ"}'
   top_return_map: '{"PUT":"PUT_REQ","READ":"READ_REQ"}'
   username: sysuser
   username: sysuser

@@ -101,4 +101,9 @@ public class CameraData {
      * 尺度之内的面积之和曲线的峰值
      * 尺度之内的面积之和曲线的峰值
      */
      */
     private Double  scaleAreaSumMax = 0.0;
     private Double  scaleAreaSumMax = 0.0;
+
+    /**
+     * 尺度之内的面积之和占比
+     */
+    private Integer  scaleAreaSumPercentage = 0;
 }
 }

@@ -44,8 +44,11 @@ public class ScaleStepMethodService {
             StringBuffer stringBuffer = new StringBuffer();
             StringBuffer stringBuffer = new StringBuffer();
             stringBuffer.append(nowtime);
             stringBuffer.append(nowtime);
             stringBuffer.append(" ");
             stringBuffer.append(" ");
+
             //如果鱼群急剧减少，就停止投料
             //如果鱼群急剧减少，就停止投料
-            if (((OperatingData.cameraData.getScaleAreaSumMax()*OperatingData.cameraConfig.getStopTriggeringConditions())/100)-sum>=0)
+            Integer scaleAreaSumPercentage = new Double((sum/OperatingData.cameraData.getScaleAreaSumMax())*100).intValue();
+            OperatingData.cameraData.setScaleAreaSumPercentage(scaleAreaSumPercentage);
+            if (scaleAreaSumPercentage-OperatingData.cameraConfig.getStopTriggeringConditions()<=0)
             {
             {
                 Condata condata = OperatingData.feederConfig.getCondata();
                 Condata condata = OperatingData.feederConfig.getCondata();
 
 
@@ -86,7 +89,7 @@ public class ScaleStepMethodService {
             }
             }
 
 
             //如果鱼群急剧增加，。。。
             //如果鱼群急剧增加，。。。
-            if (OperatingData.cameraData.getScaleAreaSumMax()-((OperatingData.cameraData.getScaleAreaSumMax()*OperatingData.cameraConfig.getStopTriggeringConditions())/100)-sum<=0)
+            if (100-OperatingData.cameraConfig.getStopTriggeringConditions()-scaleAreaSumPercentage<=0)
             {
             {
                 stringBuffer.append("发现鱼群急剧增加，");
                 stringBuffer.append("发现鱼群急剧增加，");