From be17f47d43596999f46e0b202d485ccba496b687 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 08 七月 2024 09:23:00 +0800
Subject: [PATCH] 电磁锁与三一车辆耦合修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
index 95d0239..473148e 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.*;
+import com.github.pagehelper.PageHelper;
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
@@ -138,22 +139,23 @@
@Override
//public Results List<Map<String,Object>> getAll(String usersId) {
- public List<Map<String,Object>> getAll(String usersId) {
+ public Map<String,Object> getAll(String usersId) {
+ List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
if(ardSyUser == null){
- return new ArrayList();
+ return new HashMap();
}
List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
String syURL = "";
if(syURLResult.size() != 0){
syURL = syURLResult.get(0).getConfigValue();
}else{
- return new ArrayList();
+ return new HashMap();
}
String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId());
String sessionId = (String) LogInResult.get("sessionId");
- List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
+ //List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
List<Map<String,Object>> result = new ArrayList();
for(ArdTankLock ardTankLock : ardTankLockList){
Map<String,Object> map = new HashMap();
@@ -200,8 +202,11 @@
}
}
}
- //return Results.succeed(result0);
- return result0;
+ Long total = ardTankLockMapper.selectArdTankLockTotal();
+ Map<String,Object> resultMap = new HashMap();
+ resultMap.put("list",result0);
+ resultMap.put("total",total);
+ return resultMap;
}
@Override
@@ -320,38 +325,41 @@
}
@Override
- public List<Map<String, String>> getLockByCarPlate(String usersId, String carPlate) {
+ public Map<String,Object> getLockByCarPlate(String usersId, String carPlate, Integer pageNum, Integer pageSize) {
ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
if(ardSyUser == null){
- return new ArrayList();
+ return new HashMap();
}
List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
String syURL = "";
if(syURLResult.size() != 0){
syURL = syURLResult.get(0).getConfigValue();
}else{
- return new ArrayList();
+ return new HashMap();
}
String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId());
String sessionId = (String) LogInResult.get("sessionId");
- List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
- List<Map<String,String>> result = new ArrayList();
+ List<ArdTankLock> ardTankLockList = new ArrayList();
+ List<Map<String,Object>> result = new ArrayList();
+ List<String> carIdList = new ArrayList();//璁板綍涓変竴杞﹁締涓婚敭
if(!carPlate.equals("")){
Map<String,Object> carMap = sYClient.getCarListByPlate(syURL,carPlate,ardSyUser.getUserId(),sessionId);//杞︾墝鍙锋ā绯婃悳绱㈣溅杈�
List<Map<String,Object>> carList = new ArrayList();
if(((String)carMap.get("rspCode")).equals("1")){
carList = (List<Map<String, Object>>) carMap.get("list");
}else{
- return new ArrayList();
+ return new HashMap();
}
- List<String> carIdList = new ArrayList();//璁板綍涓変竴杞﹁締涓婚敭
+ //List<String> carIdList = new ArrayList();//璁板綍涓変竴杞﹁締涓婚敭
for(Map<String,Object> map : carList){
carIdList.add((String) map.get("carId"));
}
+ PageHelper.startPage(pageNum, pageSize);//鍒嗛〉
+ ardTankLockList = ardTankLockMapper.getLockByCarIdList(carIdList);
for(ArdTankLock ardTankLock : ardTankLockList){
if(carIdList.contains(ardTankLock.getCarId())){//杩斿洖鐨勮溅杈嗗寘鍚暟鎹簱褰曞叆鐨勮溅杈�
- Map<String,String> map = new HashMap();
+ Map<String,Object> map = new HashMap();
map.put("id",ardTankLock.getId());
map.put("lockNum",ardTankLock.getLockNum());
map.put("lockName",ardTankLock.getLockName());
@@ -377,8 +385,10 @@
}
}
}else{
+ PageHelper.startPage(pageNum, pageSize);//鍒嗛〉
+ ardTankLockList = ardTankLockMapper.getAll();
for(ArdTankLock ardTankLock : ardTankLockList){
- Map<String,String> map = new HashMap();
+ Map<String,Object> map = new HashMap();
map.put("id",ardTankLock.getId());
map.put("lockNum",ardTankLock.getLockNum());
map.put("lockName",ardTankLock.getLockName());
@@ -404,6 +414,15 @@
result.add(map);
}
}
- return result;
+ Long total = Long.valueOf(0);
+ if(!carPlate.equals("")){
+ total = ardTankLockMapper.selectArdTankLockTotalByCarIdList(carIdList);
+ }else{
+ total = ardTankLockMapper.selectArdTankLockAllTotal();
+ }
+ Map<String,Object> mapResult = new HashMap();
+ mapResult.put("list",result);
+ mapResult.put("total",total);
+ return mapResult;
}
}
--
Gitblit v1.9.3