From 38f29e38fcc668171dc05c53d40a36b895c86102 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 10 十月 2024 13:34:28 +0800
Subject: [PATCH] init
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 41 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
index d1d5335..607f1dc 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java
@@ -6,6 +6,7 @@
import java.util.*;
import com.alibaba.fastjson2.JSON;
+import com.github.pagehelper.PageHelper;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -217,7 +218,7 @@
return AjaxResult.error("褰撳墠杞﹁締姝ｅ鍦ㄧ數瀛愬洿鏍忓");
}else{
try{
- if(PositionContainer.getCarLockProcessThreadMap().get(carId).get(lockNum).get("lockProcess") != null){
+ if(PositionContainer.getCarLockProcessThreadMap().get(carId).get(lockNum).get("lockProcess") == null){
PositionContainer.getCarLockProcessThreadMap().get(carId).get(lockNum).put("lockProcess",new Thread());//鍔犲叆瀹瑰櫒
String lockNumHead = lockNum.substring(0,2);
String lockNumTail = lockNum.substring(2,4);
@@ -450,7 +451,10 @@
continue;
}
}
- break;//澶勫湪浠绘剰鐢靛瓙鍥存爮涓�
+ //break;
+ return;//澶勫湪浠绘剰鐢靛瓙鍥存爮涓�
+ }else{
+ continue;
}
}
}
@@ -588,6 +592,41 @@
}
}
+ @Override
+ public Map<String, Object> getArdTankLockProcessLogByCarPlate(Map<String, Object> para) {
+ //鍒嗛〉灞炴��
+ Integer pageNum = (Integer) para.get("pageNum");
+ Integer pageSize = (Integer) para.get("pageSize");
+
+ PageHelper.startPage(pageNum, pageSize);//鍒嗛〉
+ Map<String,Object> resultMap = new HashMap();
+ if(((String) para.get("carPlate")).equals("")){
+ List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogAll();
+ Long total = ardTankLockProcessLogMapper.getArdTankLockProcessLogTotal();
+ resultMap.put("list",resultList);
+ resultMap.put("total",total);
+ return resultMap;
+ }else{
+ List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogByCarPlate("%" + (String) para.get("carPlate") + "%");
+ Long total = ardTankLockProcessLogMapper.getArdTankLockProcessLogTotalByCarPlate("%" + (String) para.get("carPlate") + "%");
+ resultMap.put("list",resultList);
+ resultMap.put("total",total);
+ return resultMap;
+ }
+
+ }
+
+ @Override
+ public List<ArdTankLockProcessLog> exportArdTankLockProcessLog(String carPlate) {
+ if(carPlate.equals("")){
+ List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogAll();
+ return resultList;
+ }else{
+ List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogByCarPlate("%" + carPlate + "%");
+ return resultList;
+ }
+ }
+
public Map<String,Object> sendCmd(String syURL,String userId,String carId,Integer cmdId,String cmd,String paramsStr,String sessionId){
OkHttpClient okHttpClient = new OkHttpClient();
--
Gitblit v1.9.3