修改bug

# Conflicts:
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/CoupletMsgApplication.java
#	couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java
#	couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java
#	couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/RealTimeDataRequest.java

@@ -6,6 +6,7 @@ import lombok.NoArgsConstructor;
 import lombok.ToString;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author fufanrui
@@ -20,7 +21,7 @@ import java.io.Serializable;
 public class RealTimeDataRequest implements Serializable {
 
 
-    private Long userId;
+    private List<Long> userId;
 
     private String vin;
 

couplet-common/couplet-common-redis/src/main/java/com/couplet/common/redis/service/RedisService.java

@@ -23,7 +23,6 @@ public class RedisService {
     public RedisTemplate redisTemplate;
 
 
-
     // ... 其他已有方法 ...
 
     /**
@@ -65,7 +64,6 @@ public class RedisService {
      *
      * @param key     Redis键
      * @param timeout 超时时间
-     *
      * @return true=设置成功；false=设置失败
      */
     public boolean expire(final String key, final long timeout) {
@@ -78,7 +76,6 @@ public class RedisService {
      * @param key     Redis键
      * @param timeout 超时时间
      * @param unit    时间单位
-     *
      * @return true=设置成功；false=设置失败
      */
     public boolean expire(final String key, final long timeout, final TimeUnit unit) {
@@ -89,7 +86,6 @@ public class RedisService {
      * 获取有效时间
      *
      * @param key Redis键
-     *
      * @return 有效时间
      */
     public long getExpire(final String key) {
@@ -100,7 +96,6 @@ public class RedisService {
      * 判断 key是否存在
      *
      * @param key 键
-     *
      * @return true 存在 false不存在
      */
     public Boolean hasKey(String key) {
@@ -111,7 +106,6 @@ public class RedisService {
      * 获得缓存的基本对象。
      *
      * @param key 缓存键值
-     *
      * @return 缓存键值对应的数据
      */
     public <T> T getCacheObject(final String key) {
@@ -132,7 +126,6 @@ public class RedisService {
      * 删除集合对象
      *
      * @param collection 多个对象
-     *
      * @return
      */
     public boolean deleteObject(final Collection collection) {
@@ -144,7 +137,6 @@ public class RedisService {
      *
      * @param key      缓存的键值
      * @param dataList 待缓存的List数据
-     *
      * @return 缓存的对象
      */
     public <T> long setCacheList(final String key, final List<T> dataList) {
@@ -156,7 +148,6 @@ public class RedisService {
      * 获得缓存的list对象
      *
      * @param key 缓存的键值
-     *
      * @return 缓存键值对应的数据
      */
     public <T> List<T> getCacheList(final String key) {
@@ -168,7 +159,6 @@ public class RedisService {
      *
      * @param key     缓存键值
      * @param dataSet 缓存的数据
-     *
      * @return 缓存数据的对象
      */
     public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) {
@@ -179,12 +169,12 @@ public class RedisService {
         }
         return setOperation;
     }
+
     /**
      * 缓存Set
      *
      * @param key      缓存键值
      * @param setValue 缓存的数据
-     *
      * @return 缓存数据的对象
      */
     public <T> BoundSetOperations<String, T> setCacheSet(final String key, final T setValue) {
@@ -192,12 +182,12 @@ public class RedisService {
         setOperation.add(setValue);
         return setOperation;
     }
+
     /**
      * 缓存Set
      *
      * @param key      缓存键值
      * @param setValue 缓存的数据
-     *
      * @return 缓存数据的对象
      */
     public <T> void deleteSet(String key, String setValue) {
@@ -205,11 +195,11 @@ public class RedisService {
         BoundSetOperations setOperations = redisTemplate.boundSetOps(key);
         setOperations.remove(setValue);
     }
+
     /**
      * 获得缓存的set
      *
      * @param key
-     *
      * @return
      */
     public <T> Set<T> getCacheSet(final String key) {
@@ -217,7 +207,6 @@ public class RedisService {
     }
 
 
-
     /**
      * 缓存Map
      *
@@ -234,7 +223,6 @@ public class RedisService {
      * 获得缓存的Map
      *
      * @param key
-     *
      * @return
      */
     public <T> Map<String, T> getCacheMap(final String key) {
@@ -257,7 +245,6 @@ public class RedisService {
      *
      * @param key  Redis键
      * @param hKey Hash键
-     *
      * @return Hash中的对象
      */
     public <T> T getCacheMapValue(final String key, final String hKey) {
@@ -270,7 +257,6 @@ public class RedisService {
      *
      * @param key   Redis键
      * @param hKeys Hash键集合
-     *
      * @return Hash对象集合
      */
     public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
@@ -282,7 +268,6 @@ public class RedisService {
      *
      * @param key  Redis键
      * @param hKey Hash键
-     *
      * @return 是否成功
      */
     public boolean deleteCacheMapValue(final String key, final String hKey) {
@@ -293,7 +278,6 @@ public class RedisService {
      * 获得缓存的基本对象列表
      *
      * @param pattern 字符串前缀
-     *
      * @return 对象列表
      */
     public Collection<String> keys(final String pattern) {
@@ -302,7 +286,7 @@ public class RedisService {
 
     public void setVinAndUserId(RealTimeDataRequest realTimeDataRequest) {
         String key = "vin:" + realTimeDataRequest.getVin();
-        redisTemplate.opsForValue().set(key, realTimeDataRequest);
+        redisTemplate.opsForSet().add(key, realTimeDataRequest);
     }
 
     public void stopViewingData(String vin) {

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/CoupletMsgApplication.java

@@ -1,5 +1,7 @@
 package com.couplet.analyze.msg;
 
+import com.couplet.analyze.msg.model.ModelsKafkaMessage;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -18,5 +20,8 @@ public class CoupletMsgApplication {
     public static void main(String[] args) {
         SpringApplication.run(CoupletMsgApplication.class);
         System.out.println("解析系统启动成功");
+        new ModelsKafkaMessage().initKafkaConsumer();
     }
+
+
 }

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java

@@ -1,5 +1,6 @@
 package com.couplet.analyze.msg.model;
 
+
 import com.couplet.analyze.common.event.AnalyzeEventCache;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.service.IncidentService;
@@ -10,6 +11,7 @@ import org.apache.kafka.clients.consumer.ConsumerConfig;
 import org.apache.kafka.clients.consumer.ConsumerRecords;
 import org.apache.kafka.clients.consumer.KafkaConsumer;
 import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -36,7 +38,7 @@ import static java.lang.Thread.sleep;
 @Component
 @Slf4j
 public class ModelsKafkaMessage {
-    private static final String TOPIC_NAME = "lyh";
+    private static final String TOPIC_NAME = "topic_lyh";
     private static final String BOOTSTRAP_SERVERS = "39.103.133.136:9092";
 
 
@@ -50,13 +52,16 @@ public class ModelsKafkaMessage {
     private AnalyzeEventCache analyzeEventCache;
 
 
+
+
+
     //kafka消费者初始化
     @PostConstruct
     public void initKafkaConsumer() {
         Properties props = new Properties();
         props.put(ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG, BOOTSTRAP_SERVERS);
 //        props.put(ConsumerConfig.GROUP_ID_CONFIG, "my-consumer-group");
-        props.put(ConsumerConfig.GROUP_ID_CONFIG, "lll");
+        props.put(ConsumerConfig.GROUP_ID_CONFIG, "group");
         props.put(ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
         props.put(ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG, "org.apache.kafka.common.serialization.StringDeserializer");
 
@@ -86,7 +91,7 @@ public class ModelsKafkaMessage {
             while (true) {
                 ConsumerRecords<String, String> records = consumer.poll(Duration.ofMillis(100));
                 records.forEach(record -> {
-                    System.out.println("接收到的数据：" + record.value());
+                    log.info("接收到的数据：" + record.value());
                     String str = hexToString(record.value());
                     List<CoupletMsgData> coupletMsgDataList = sendMsg(str);
                     for (CoupletMsgData msgData : coupletMsgDataList) {

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/ElectronicFenceServiceImpl.java

@@ -5,6 +5,7 @@ import com.couplet.analyze.common.contents.AnalyzeEventContents;
 import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.service.IncidentService;
 import com.couplet.common.core.text.Convert;
+import com.couplet.common.core.utils.StringUtils;
 import com.couplet.common.domain.Fence;
 import com.couplet.common.domain.request.FenceAndLogeRequest;
 import com.couplet.common.redis.service.RedisService;
@@ -46,12 +47,9 @@ public class ElectronicFenceServiceImpl implements IncidentService {
         if (redisService.hasKey(fenceKey)) {
             Set<Fence> cacheSet = redisService.getCacheSet(fenceKey);
             log.info("电子围栏事件redis存在.......");
-//            jingdu;
-//            longitude;
-//            weidu;
-//            latitude;
             for (Fence fence : cacheSet) {
                 String fenceLongitudeLatitude = fence.getFenceLongitudeLatitude();
+                if (StringUtils.isEmpty(fenceLongitudeLatitude)){
                     /**
                      * 先通过；后切割
                      */
@@ -77,6 +75,7 @@ public class ElectronicFenceServiceImpl implements IncidentService {
                         }
                     }
                 }
+            }
             log.info("电子围栏事件结束.......");
         }
         log.info("电子围栏事件结束.......");

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java

@@ -5,6 +5,7 @@ import com.couplet.analyze.msg.domain.CoupletMsgData;
 import com.couplet.analyze.msg.mapper.IncidentMapper;
 import com.couplet.analyze.msg.service.IncidentService;
 import com.couplet.analyze.msg.service.impl.realTimeData.RealTimeJudge;
+import com.couplet.common.core.utils.StringUtils;
 import com.couplet.common.domain.request.RealTimeDataRequest;
 import com.couplet.common.redis.service.RedisService;
 import com.couplet.remote.RemoteRealTimeService;
@@ -12,6 +13,8 @@ import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -23,12 +26,6 @@ import java.util.concurrent.TimeUnit;
 @Log4j2
 public class RealTimeDataServiceImpl implements IncidentService {
 
-    /**
-     * 查询传入的数据是否存在
-     */
-    @Autowired
-    private IncidentMapper incidentMapper;
-
     @Autowired
     private RedisService redisService;
 
@@ -40,28 +37,16 @@ public class RealTimeDataServiceImpl implements IncidentService {
     @Override
     public void incident(CoupletMsgData coupletMsgData) {
         log.info("实时数据事件开始.....");
-        RealTimeDataRequest cacheObject = redisService.getCacheObject("vin:" + coupletMsgData.getVin());
-//        //判断是否有缓存数据
-//        if (redisService.hasKey("vin:query:" + coupletMsgData.getVin())){
-//            redisService.deleteObject("vin:query:" + coupletMsgData.getVin());
-//        }
-//         if (RealTimeJudge.isJudge(coupletMsgData.getVin())) {
-        if (coupletMsgData.getVin().equals(cacheObject.getVin())){
-//            log.info("有实时数据，值为：[{}]开始传输实时数据", coupletMsgData.getVin());
-             //判断数据是否一致，
-//             if (RealTimeJudge.addRealTime(cacheObject)) {
-                 log.info("[{}]有缓存数据，值为：[{}]，且缓存数据与实时数据一致，开始传输实时数据", coupletMsgData.getVin(), cacheObject);
+
+        if (redisService.hasKey("实时轨迹vin:"+ coupletMsgData.getVin())){
+            boolean a= ("实时轨迹vin:" + coupletMsgData.getVin()).equals("实时轨迹vin:"+ coupletMsgData.getVin());
+            if (a){
+                log.info("[{}]有缓存数据，值为：[{}]，且缓存数据与实时数据一致，开始传输实时数据", coupletMsgData.getVin(), coupletMsgData);
                 redisService.setCacheSet("vin:query:" + coupletMsgData.getVin(), coupletMsgData);
                 redisService.expire("vin:"+coupletMsgData.getVin(),10, TimeUnit.MINUTES);
-//             } else {
-//                 log.info("[{}]有缓存数据，值为：[{}]，且缓存数据与实时数据不一致，开始传输实时数据", coupletMsgData.getVin(), cacheObject);
-//             }
             }
-
-        log.info("[{}]开始传输实时数据", coupletMsgData.getVin());
-
+        }
         log.info("实时数据事件结束.....");
-
     }
 
     /**

couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/realTimeData/RealTimeJudge.java

@@ -37,7 +37,7 @@ public class RealTimeJudge {
             userIds = new HashSet<>();
             setMap.put(realTimeDataRequest.getVin(),userIds);
         }
-        userIds.add(realTimeDataRequest.getUserId());
+//        userIds.add(realTimeDataRequest.getUserId());
         return true;
     }
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenceServiceImpl.java

@@ -44,12 +44,12 @@ public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements
      */
     @Autowired
     private StringRedisTemplate redisTemplate;
+
     /**
      * 远程调用队列服务
      */
 //    @Autowired
 //    private RemoteFenceService remoteFenceService;
-
     @Override
     public List<Fence> pageQuery(FenceConfig fenceConfig) {
         List<Fence> list = fenceMapper.pageQuery(fenceConfig);
@@ -70,36 +70,26 @@ public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements
 //        remoteFenceService.fenceQueue(fenceUpdateRequest);
     }
 
-    @Override
-    public void fenceInsert(FenceRequest fenceRequest) {
-
-    }
-
     /**
      * 业务实现:添加围栏
      *
-     * @param request
+     * @param
      * @param fenceRequest
      */
-//    @Override
-//    public void fenceInsert(HttpServletRequest request, FenceRequest fenceRequest) {
-//        String username = SecurityUtils.getUsername();
-//        fenceRequest.setCrateName(username);
-//        //先添加围栏
-//        fenceMapper.insertFence(fenceRequest);
-//        String[] logoIds = fenceRequest.getLogoIds();
-//        String[] parts = new String[0];
-//        for (String logoId : logoIds) {
-//            //把前台传入的字符串分割成数组
-//            parts = logoId.split(",");
-//            //再添加围栏和标识中间表
-//            fenAndLogoService.addBach(fenceRequest.getFenceId(), parts);
-//        }
-//        /**
-//        * 电子围栏发送改变
-//        */
-//        redisTemplate.opsForValue().set("fenceInsert", JSON.toJSONString(fenceRequest), 10, TimeUnit.MINUTES);
-//    }
+    @Override
+    public void fenceInsert(FenceRequest fenceRequest) {
+        String username = SecurityUtils.getUsername();
+        fenceRequest.setCrateName(username);
+        fenceRequest.setMaintainerName(username);
+        //先添加围栏
+        fenceMapper.insertFence(fenceRequest);
+
+        fenAndLogoService.addBach(fenceRequest.getFenceId(), fenceRequest.getLogoIds());
+        /**
+         * 电子围栏发送改变
+         */
+        redisTemplate.opsForValue().set("fenceInsert", JSON.toJSONString(fenceRequest), 10, TimeUnit.MINUTES);
+    }
 
     @Override
     public void removeByFenceId(Long fenceId) {

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleDetectionServiceImpl.java

@@ -21,8 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import springfox.documentation.spring.web.json.Json;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.reflect.Array;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -53,21 +53,26 @@ public class VehicleDetectionServiceImpl implements VehicleDetectionService{
     public List<CoupletMsgData> monitorinDataList(String vin) {
         String key = "vin:query:" + vin;
         log.info("key为:"+key);
-        CoupletMsgData coupletMsgData = redisService.getCacheObject(key);
-        ArrayList<CoupletMsgData> coupletMsgDataArrayList = new ArrayList<>();
-        coupletMsgDataArrayList.add(coupletMsgData);
-        return coupletMsgDataArrayList;
+        Set<CoupletMsgData> cacheSet = redisService.getCacheSet(key);
+        ArrayList<CoupletMsgData> coupletMsgData = new ArrayList<>(cacheSet);
+        return coupletMsgData;
     }
 
     @Override
     public void monitorinData(String vin) {
+        //创建对象
         RealTimeDataRequest realTimeDataRequest = new RealTimeDataRequest();
+        //获取用户id
         Long userId = SecurityUtils.getUserId();
+        //设置车辆vin
         realTimeDataRequest.setVin(vin);
-        realTimeDataRequest.setUserId(userId);
-//        analyzeEventCache.queryEvent("查询实时数据"+vin,realTimeDataRequest);
-//        redisService.expire("查询实时数据"+vin,4,TimeUnit.MINUTES);
-        redisService.setVinAndUserId(realTimeDataRequest);
+        //创建hashSet集合
+        HashSet<Long> objects = new HashSet<>();
+        //添加车辆id
+        objects.add(userId);
+        //把对象放入hashSet集合中
+        //存储的对象是:key:业务+vin  value: hashSet集合类型的对象
+        redisService.setCacheSet("实时轨迹vin:"+ vin,objects);
     }
 
     @Override

couplet-modules/couplet-business/src/main/resources/mapper/business/FenceMapper.xml

@@ -60,8 +60,7 @@
      INSERT INTO `couplet-cloud`.`couplet_fence_info`
          (`fence_name`,`fence_longitude_latitude`, `fence_description`, `is_delete`, `fence_state`, `create_time`,
           `update_time`, `create_name`, `maintainer_name`, `alarm_status`, `fence_condition`)
-        VALUES
-            (#{fenceName}, null, #{fenceDescription}, 0, 0, now(), null, null, #{maintainerName}, 0 ,0)
+            VALUES (#{fenceName}, NULL, #{fenceDescription} , 0, 0, now(), NULL, #{crateName}, #{maintainerName}, 0, 1)
 
 
     </insert>

couplet-modules/couplet-modules-mq/src/main/java/com/couplet/mq/controller/MqController.java

@@ -74,7 +74,7 @@ public class MqController {
         RealTimeDataRequest realTimeDataRequest = new RealTimeDataRequest();
         realTimeDataRequest.setVin(vin);
         Long userId = SecurityUtils.getUserId();
-        realTimeDataRequest.setUserId(userId);
+
         rabbitTemplate.convertAndSend(RabbitMQConfig.VinExchangeName, RabbitMQConfig.VinRoutingKey, realTimeDataRequest,
                 message -> {
                     message.getMessageProperties().setMessageId(IdUtils.randomUUID());

couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java

@@ -76,7 +76,7 @@ public class MqttMonitor {
 
 
     //Kafka生产者配置
-    private static final String TOPIC_NAME = "lyh";
+    private static final String TOPIC_NAME = "topic_lhy";
     private static final String BOOTSTRAP_SERVERS = "39.103.133.136:9092";
 
     //线程池，用于异步处理消息到来时的业务逻辑

couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置
@@ -38,7 +36,7 @@ mqtt:
     #    broker: mqtt://115.159.47.13:1883
     username:
     password:
-    clientId: liuyunhu
+    clientId: aaaaaad
     qos: 0
-    topic: liuyunhu
+    topic: xiaoYao