From 85f0196891cdf5bc2f80f384df47c7d27fc5d23a Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 09 八月 2023 15:10:52 +0800
Subject: [PATCH] 修改雷达报警聚合方式
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index bf45df9..eb3fa5c 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -14,6 +14,8 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.domain.ArdSyCarDay;
+import com.ruoyi.sy.mapper.ArdSyCarDayMapper;
import com.ruoyi.utils.websocket.util.WebSocketUtils;
import com.ruoyi.device.hiksdk.config.MinioClientSingleton;
import com.ruoyi.storage.minio.utils.MinioUtils;
@@ -68,6 +70,9 @@
@Resource
private SYClient sYClient;
+
+ @Resource
+ private ArdSyCarDayMapper ardSyCarDayMapper;
private Map<Integer,Map<String,String>> logInMap = new HashMap();
@@ -798,7 +803,7 @@
}
}
- @Override
+ /*@Override
public Results getExistTraceByCarIdAndMonth(String userId, String carId, String time) {
SysConfig config = new SysConfig();
config.setConfigKey("syCarPT");
@@ -820,6 +825,17 @@
return Results.succeed(existTraceMap);
}
}
+ }*/
+
+ @Override
+ public Results getExistTraceByCarIdAndMonth(String userId, String carId, String time) {
+ List<ArdSyCarDay> result = ardSyCarDayMapper.selectArdSyCarDayByCarIdAndDay(carId,time + "%");
+ List<String> list = new ArrayList();
+ for(ArdSyCarDay ardSyCarDay : result){
+// list.add(ardSyCarDay.getDay().split("-")[2]);
+ list.add(ardSyCarDay.getDay());
+ }
+ return Results.succeed(list);
}
public Map<String,Integer> getExistTraceByCarIdAndMonth(String url,String usersId,String password,String carId,String time){
--
Gitblit v1.9.3