From 56b6e1d795e9a4badee9229d8a6ccd6e0d56d4c1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期四, 04 七月 2024 10:22:25 +0800
Subject: [PATCH] 电磁锁电子围栏概要提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockServiceImpl.java | 129 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 123 insertions(+), 6 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 df379cd..d7980f6 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
@@ -143,18 +143,19 @@
}
@Override
- public Results getAll(String usersId) {
+ //public Results List<Map<String,Object>> getAll(String usersId) {
+ public List<Map<String,Object>> getAll(String usersId) {
ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
- if(ardSyUser == null){
+ /*if(ardSyUser == null){
return Results.error("娌℃湁鎸傛帴涓変竴杞﹁締鐢ㄦ埛");
- }
+ }*/
List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
String syURL = "";
if(syURLResult.size() != 0){
syURL = syURLResult.get(0).getConfigValue();
- }else{
+ }/*else{
return Results.error("涓変竴杞﹁締鍦板潃鏈綍鍏�");
- }
+ }*/
String passwordMd5 = DigestUtils.md5Hex(ardSyUser.getPassword());
Map<String, Object> LogInResult = sYClient.logIn(syURL, passwordMd5, ardSyUser.getUserId());
String sessionId = (String) LogInResult.get("sessionId");
@@ -205,6 +206,122 @@
}
}
}
- return Results.succeed(result0);
+ //return Results.succeed(result0);
+ return result0;
+ }
+
+ @Override
+ public Map<String, Object> getLockByCarId(String carId, String usersId) {
+ ArdSyUser ardSyUser = ardSyUserMapper.userById(usersId);
+ /*if(ardSyUser == null){
+ return Results.error("娌℃湁鎸傛帴涓変竴杞﹁締鐢ㄦ埛");
+ }*/
+ List<SysConfig> syURLResult = sysConfigMapper.selectByType("syCarPT");
+ String syURL = "";
+ if(syURLResult.size() != 0){
+ syURL = syURLResult.get(0).getConfigValue();
+ }/*else{
+ return Results.error("涓変竴杞﹁締鍦板潃鏈綍鍏�");
+ }*/
+ 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;
}
}
--
Gitblit v1.9.3