Merge branch 'server_five_fufanrui' of https://gitea.qinmian.online/five-groups/five-groups-couplet into server_five

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

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

@@ -304,9 +304,13 @@ public class RedisService {
     }
 
     public void setVinAndUserId(RealTimeDataRequest realTimeDataRequest) {
-        String key  = "vin:"+realTimeDataRequest.getVin()+"userId:"+realTimeDataRequest.getUserId();
+        String key  = "vin:"+realTimeDataRequest.getVin();
         redisTemplate.opsForValue().set(key, realTimeDataRequest);
     }
 
+    public void stopViewingData(String vin) {
 
+        String key  = "vin:"+vin;
+        redisTemplate.delete(key);
+    }
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleDetectionController.java

@@ -59,8 +59,13 @@ public class VehicleDetectionController {
         vehicleDetectionService.monitorinData(vin);
     }
 
-
+    /*
-
+     * @param :
+      * @return Result<List<CoupletVehicleData>>
+     * @author 付凡芮
+     * @description 查看事实数据列表
+     * @date
+     */
     @PostMapping("realData")
     public Result<List<CoupletVehicleData>> realData(){
         List<CoupletVehicleData> list = redisService.getList();
@@ -68,4 +73,16 @@ public class VehicleDetectionController {
         return success;
     }
 
+    /*
+     * @param vin:
+      * @return void
+     * @author 付凡芮
+     * @description 停止传送实时数据
+     * @date
+     */
+    @PostMapping("stopViewingData/{vin}")
+    public void stopViewingData(@PathVariable String vin){
+        vehicleDetectionService.stopViewingData(vin);
+    }
+
 }

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

@@ -10,4 +10,7 @@ public interface VehicleDetectionService {
     List<Vehicle> detectionList();
 
     void monitorinData(String vin);
+
+
+    void stopViewingData(String vin);
 }

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

@@ -47,4 +47,9 @@ public class VehicleDetectionServiceImpl implements VehicleDetectionService{
 
     }
 
+    @Override
+    public void stopViewingData(String vin) {
+        redisService.stopViewingData(vin);
+    }
+
 }