From 9b8bb10acf41929d9fa2750fa069302ad317c8cf Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 06 七月 2024 14:40:26 +0800
Subject: [PATCH] 电磁锁车辆查询修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 278 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 261 insertions(+), 17 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 f4acfbf..c708f40 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
@@ -1,9 +1,7 @@
package com.ruoyi.sy.service.impl;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
-import com.dtflys.forest.annotation.Var;
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdSyUser;
@@ -12,15 +10,11 @@
import com.ruoyi.sy.mapper.ArdTankWallLockTemporaryMapper;
import com.ruoyi.system.mapper.SysConfigMapper;
import com.ruoyi.utils.forest.SYClient;
-import com.ruoyi.utils.result.Results;
import org.apache.commons.codec.digest.DigestUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Map;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import java.util.stream.Collectors;
+
import com.ruoyi.sy.mapper.ArdTankLockMapper;
import com.ruoyi.sy.domain.ArdTankLock;
import com.ruoyi.sy.service.IArdTankLockService;
@@ -78,14 +72,31 @@
/**
* 鏂板鐢电閿�
*
- * @param ardTankLock 鐢电閿�
* @return 缁撴灉
*/
@Override
+ public int insertArdTankLock(Map<String,Object> para) {
+ String carId = (String) para.get("carId");
+ List<Map<String,String>> lockList = (List<Map<String,String>>)para.get("lockList");
+ List<ArdTankLock> ardTankLocks = new ArrayList();
+ for(Map<String,String> map : lockList){
+ ArdTankLock ardTankLock = new ArdTankLock();
+ ardTankLock.setId(IdUtils.simpleUUID());
+ ardTankLock.setLockNum(map.get("lockNum"));
+ ardTankLock.setLockName(map.get("lockName"));
+ ardTankLock.setImgPositionTop(map.get("imgPositionTop"));
+ ardTankLock.setImgPositionLeft(map.get("imgPositionLeft"));
+ ardTankLock.setCarId(carId);
+ ardTankLock.setEnable(map.get("enable"));
+ ardTankLocks.add(ardTankLock);
+ }
+ return ardTankLockMapper.insertArdTankLocks(ardTankLocks);
+ }
+ /*@Override
public int insertArdTankLock(ArdTankLock ardTankLock) {
ardTankLock.setId(IdUtils.simpleUUID());
return ardTankLockMapper.insertArdTankLock(ardTankLock);
- }
+ }*/
/**
* 淇敼鐢电閿�
@@ -126,22 +137,24 @@
}
@Override
- public Results getAll(String usersId) {
+ //public Results 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 Results.error("娌℃湁鎸傛帴涓変竴杞﹁締鐢ㄦ埛");
+ return new HashMap();
}
List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
String syURL = "";
if(syURLResult.size() != 0){
syURL = syURLResult.get(0).getConfigValue();
}else{
- return Results.error("涓変竴杞﹁締鍦板潃鏈綍鍏�");
+ 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();
@@ -152,7 +165,11 @@
map.put("imgPositionLeft",ardTankLock.getImgPositionLeft());
map.put("carId",ardTankLock.getCarId());
map.put("enable",ardTankLock.getEnable());
- map.put("restartState",ardTankLock.getRestartState());
+ if(ardTankLock.getRestartState() == null){
+ map.put("restartState","");
+ }else{
+ map.put("restartState",ardTankLock.getRestartState());
+ }
if(ardTankLock.getOnlineTime() == null){
map.put("onlineTime","");
}else{
@@ -165,6 +182,233 @@
}
result.add(map);
}
- return Results.succeed(result);
+ List<Map<String,Object>> result0 = new ArrayList();//鎷兼帴carId鍜宑arPlate
+ Set<String> carIdSet = new HashSet();
+ for(Map<String,Object> map : result){
+ if(!carIdSet.contains((String) map.get("carId"))){
+ Map<String,Object> mapr = new HashMap();
+ mapr.put("carId",map.get("carId"));
+ mapr.put("carPlate",map.get("carPlate"));
+ mapr.put("lockList",new ArrayList());
+ result0.add(mapr);
+ }
+ carIdSet.add((String) map.get("carId"));
+ }
+ for(Map<String,Object> map : result0){
+ for(Map<String,Object> map0 : result){
+ if(((String)map.get("carId")).equals((String)map0.get("carId"))){
+ ((List)map.get("lockList")).add(map0);
+ }
+ }
+ }
+ Long total = ardTankLockMapper.selectArdTankLockTotal();
+ Map<String,Object> resultMap = new HashMap();
+ resultMap.put("list",result0);
+ resultMap.put("total",total);
+ return resultMap;
+ }
+
+ @Override
+ public Map<String, Object> getLockByCarId(String carId, String usersId) {
+ ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
+ if(ardSyUser == null){
+ return new HashMap();
+ }
+ List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
+ String syURL = "";
+ if(syURLResult.size() != 0){
+ syURL = syURLResult.get(0).getConfigValue();
+ }else{
+ 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.getLockByCarId(carId);
+ Map<String,Object> syResult = sYClient.getCarNearPositionByCarId(syURL, carId, ardSyUser.getUserId(), sessionId);
+
+ Map<String,Object> resultMap = new HashMap();
+ if(ardTankLockList.size() != 0){
+ resultMap.put("carId",carId);
+ if(((String)syResult.get("rspCode")).equals("1")){
+ Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0);
+ resultMap.put("carPlate",carMap.get("carPlate"));
+ }
+ }else{
+ resultMap.put("carId",carId);
+ if(((String)syResult.get("rspCode")).equals("1")){
+ Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0);
+ resultMap.put("carPlate",carMap.get("carPlate"));
+ }
+ resultMap.put("lockList",new ArrayList());
+ }
+
+ List<Map<String,Object>> result = new ArrayList();
+ for(ArdTankLock ardTankLock : ardTankLockList){
+ Map<String,Object> map = new HashMap();
+ map.put("id",ardTankLock.getId());
+ map.put("lockNum",ardTankLock.getLockNum());
+ map.put("lockName",ardTankLock.getLockName());
+ map.put("imgPositionTop",ardTankLock.getImgPositionTop());
+ map.put("imgPositionLeft",ardTankLock.getImgPositionLeft());
+ map.put("carId",ardTankLock.getCarId());
+ map.put("enable",ardTankLock.getEnable());
+ if(ardTankLock.getRestartState() == null){
+ map.put("restartState","");
+ }else{
+ map.put("restartState",ardTankLock.getRestartState());
+ }
+ if(ardTankLock.getOnlineTime() == null){
+ map.put("onlineTime","");
+ }else{
+ map.put("onlineTime",ardTankLock.getOnlineTime());
+ }
+ Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0);
+ map.put("carPlate",carMap.get("carPlate"));
+ result.add(map);
+ }
+ resultMap.put("lockList",result);
+ return resultMap;
+ }
+
+ @Override
+ public int deleteLockByCarId(String carId) {
+ int result = ardTankLockMapper.deleteLockByCarId(carId);
+ return result;
+ }
+
+ @Override
+ public int updateLockByCarId(Map<String, Object> para) {
+ int result = 0;
+ String carId = (String) para.get("carId");
+ List<ArdTankLock> ardTankLockOldList = ardTankLockMapper.getLockByCarId(carId);
+ Set<String> idSet = new HashSet();//涔嬪墠鐨勪富閿�
+ for(ArdTankLock ardTankLock : ardTankLockOldList){
+ idSet.add(ardTankLock.getId());
+ }
+ //Set<String> newIdSet = new HashSet();//浼犲弬鐨勪富閿�
+ List<Map<String,Object>> lockList = (List<Map<String, Object>>) para.get("lockList");
+ List<ArdTankLock> ardTankLocks = new ArrayList();
+ for(Map<String,Object> map : lockList){
+ if(map.get("id") != null){//鏈変富閿紝鍋氫慨鏀规搷浣�
+ //newIdSet.add((String) map.get("id"));
+ idSet.remove((String) map.get("id"));
+ ArdTankLock ardTankLock = new ArdTankLock();
+ ardTankLock.setId((String) map.get("id"));
+ ardTankLock.setLockNum((String) map.get("lockNum"));
+ ardTankLock.setLockName((String) map.get("lockName"));
+ ardTankLock.setImgPositionTop((String) map.get("imgPositionTop"));
+ ardTankLock.setImgPositionLeft((String) map.get("imgPositionLeft"));
+ ardTankLock.setCarId((String) map.get("carId"));
+ ardTankLock.setEnable((String) map.get("enable"));
+ result = result + ardTankLockMapper.updateArdTankLock(ardTankLock);
+ }else{//鏃犱富閿紝鍋氫慨鏀规搷浣�
+ ArdTankLock ardTankLock = new ArdTankLock();
+ ardTankLock.setId(IdUtils.simpleUUID());
+ ardTankLock.setLockNum((String) map.get("lockNum"));
+ ardTankLock.setLockName((String) map.get("lockName"));
+ ardTankLock.setImgPositionTop((String) map.get("imgPositionTop"));
+ ardTankLock.setImgPositionLeft((String) map.get("imgPositionLeft"));
+ ardTankLock.setCarId(carId);
+ ardTankLock.setEnable((String) map.get("enable"));
+ ardTankLocks.add(ardTankLock);
+ }
+ }
+ if(ardTankLocks.size() != 0){
+ result = result + ardTankLockMapper.insertArdTankLocks(ardTankLocks);
+ }
+ if(!idSet.isEmpty()){
+ result = result + ardTankLockMapper.deleteArdTankLockByIdSet(idSet);
+ }
+ return result;
+ }
+
+ @Override
+ public List<Map<String, Object>> getLockByCarPlate(String usersId, String carPlate) {
+ List<ArdTankLock> ardTankLockList = ardTankLockMapper.getAll();
+ ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
+ if(ardSyUser == null){
+ return new ArrayList();
+ }
+ List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
+ String syURL = "";
+ if(syURLResult.size() != 0){
+ syURL = syURLResult.get(0).getConfigValue();
+ }else{
+ return new ArrayList();
+ }
+ 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,Object>> result = 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();
+ }
+ List<String> carIdList = new ArrayList();//璁板綍涓変竴杞﹁締涓婚敭
+ for(Map<String,Object> map : carList){
+ carIdList.add((String) map.get("carId"));
+ }
+ for(ArdTankLock ardTankLock : ardTankLockList){
+ if(carIdList.contains(ardTankLock.getCarId())){//杩斿洖鐨勮溅杈嗗寘鍚暟鎹簱褰曞叆鐨勮溅杈�
+ Map<String,Object> map = new HashMap();
+ map.put("id",ardTankLock.getId());
+ map.put("lockNum",ardTankLock.getLockNum());
+ map.put("lockName",ardTankLock.getLockName());
+ map.put("imgPositionTop",ardTankLock.getImgPositionTop());
+ map.put("imgPositionLeft",ardTankLock.getImgPositionLeft());
+ map.put("carId",ardTankLock.getCarId());
+ map.put("enable",ardTankLock.getEnable());
+ if(ardTankLock.getRestartState() == null){
+ map.put("restartState","");
+ }else{
+ map.put("restartState",ardTankLock.getRestartState());
+ }
+ if(ardTankLock.getOnlineTime() == null){
+ map.put("onlineTime","");
+ }else{
+ map.put("onlineTime",ardTankLock.getOnlineTime());
+ }
+ Map<String,Object> car = carList.stream().filter(mapCar -> ((String)mapCar.get("carId")).equals(ardTankLock.getCarId())).collect(Collectors.toList()).get(0);
+ map.put("carPlate", (String) car.get("carPlate"));
+ result.add(map);
+ }else{
+ continue;
+ }
+ }
+ }else{
+ for(ArdTankLock ardTankLock : ardTankLockList){
+ Map<String,Object> map = new HashMap();
+ map.put("id",ardTankLock.getId());
+ map.put("lockNum",ardTankLock.getLockNum());
+ map.put("lockName",ardTankLock.getLockName());
+ map.put("imgPositionTop",ardTankLock.getImgPositionTop());
+ map.put("imgPositionLeft",ardTankLock.getImgPositionLeft());
+ map.put("carId",ardTankLock.getCarId());
+ map.put("enable",ardTankLock.getEnable());
+ if(ardTankLock.getRestartState() == null){
+ map.put("restartState","");
+ }else{
+ map.put("restartState",ardTankLock.getRestartState());
+ }
+ if(ardTankLock.getOnlineTime() == null){
+ map.put("onlineTime","");
+ }else{
+ map.put("onlineTime",ardTankLock.getOnlineTime());
+ }
+ Map<String,Object> syResult = sYClient.getCarNearPositionByCarId(syURL, ardTankLock.getCarId(), ardSyUser.getUserId(), sessionId);
+ if(((String)syResult.get("rspCode")).equals("1")){
+ Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0);
+ map.put("carPlate", (String) carMap.get("carPlate"));
+ }
+ result.add(map);
+ }
+ }
+ return result;
}
}
--
Gitblit v1.9.3