From 3975da343b27ac03df285ecbb1093579d929e4b9 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 11 八月 2023 11:59:08 +0800
Subject: [PATCH] 巡检计划修改
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 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..a57558f 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();
@@ -586,8 +591,12 @@
@Override
public Results getCarGPSTrack(Map<String,String> map,String syURL, ArdSyUser ardSyUser){
String carId = map.get("carId");
- String startTime = map.get("startTime").replace(" ", "").replace("-", "").replace(":", "");
- String endTime = map.get("endTime").replace(" ", "").replace("-", "").replace(":", "");
+ //String startTime = map.get("startTime").replace(" ", "").replace("-", "").replace(":", "");
+ //String endTime = map.get("endTime").replace(" ", "").replace("-", "").replace(":", "");
+ String time = map.get("time");
+ time = time.replace("-", "");
+ String startTime = time + "000000";
+ String endTime = time +"235959";
String maxSpeed = map.get("maxSpeed");
//31鐢ㄦ埛鍚嶅瘑鐮�
String username31 = ardSyUser.getUserId();
@@ -634,8 +643,10 @@
String[] sgnTypes = {"杩戝厜鐏俊鍙�","杩滃厜鐏俊鍙�","鍙宠浆鍚戠伅淇″彿","宸﹁浆鍚戠伅淇″彿","鍒跺姩淇″彿","鍊掓。淇″彿","闆剧伅淇″彿","绀哄粨鐏�","鍠囧彮淇″彿","绌鸿皟鐘舵��",
"绌烘尅淇″彿","缂撻�熷櫒宸ヤ綔","ABS 宸ヤ綔","鍔犵儹鍣ㄥ伐浣�","绂诲悎鍣ㄧ姸鎬�","淇濈暀","淇濈暀","淇濈暀","淇濈暀","淇濈暀","淇濈暀","淇濈暀","淇濈暀","淇濈暀","淇濈暀","淇濈暀",
"淇濈暀","淇濈暀","淇濈暀","淇濈暀","淇濈暀","淇濈暀"};
- Integer sttsHex = Integer.parseInt(stts, 16);
- String sttsBin = Integer.toBinaryString(sttsHex);
+ //Integer sttsHex = Integer.parseInt(stts, 16);
+ Long sttsHex = Long.parseLong(stts, 16);
+ //String sttsBin = Integer.toBinaryString(sttsHex);
+ String sttsBin = Long.toBinaryString(sttsHex);
if(sttsBin.length() < 32){
while(sttsBin.length() < 32){
sttsBin = "0" + sttsBin;
@@ -798,7 +809,7 @@
}
}
- @Override
+ /*@Override
public Results getExistTraceByCarIdAndMonth(String userId, String carId, String time) {
SysConfig config = new SysConfig();
config.setConfigKey("syCarPT");
@@ -820,6 +831,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