From b61c4537a78d58412ef7ccd6e2c30152d807c5b7 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 29 七月 2024 11:04:54 +0800
Subject: [PATCH] 电磁锁密码查询去除上一组密码修改提交
---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockPasswordServiceImpl.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockPasswordServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockPasswordServiceImpl.java
index 0868771..9609c6d 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockPasswordServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockPasswordServiceImpl.java
@@ -1,16 +1,19 @@
package com.ruoyi.sy.service.impl;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.domain.ArdSyUser;
+import com.ruoyi.sy.mapper.ArdSyUserMapper;
+import com.ruoyi.system.mapper.SysConfigMapper;
+import com.ruoyi.utils.forest.SYClient;
+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;
@@ -30,6 +33,15 @@
public class ArdTankLockPasswordServiceImpl implements IArdTankLockPasswordService {
@Resource
private ArdTankLockPasswordMapper ardTankLockPasswordMapper;
+
+ @Resource
+ private ArdSyUserMapper ardSyUserMapper;
+
+ @Resource
+ private SysConfigMapper sysConfigMapper;
+
+ @Resource
+ private SYClient sYClient;
/**
* 鏌ヨ缃愯溅閿佸瘑鐮�
@@ -121,4 +133,46 @@
resultMap.put("total",total);
return resultMap;
}
+
+ @Override
+ public Map<String, Object> getLockPasswordByCarId(String userId, Map<String, Object> para) {
+ ArdSyUser ardSyUser = ardSyUserMapper.userById(userId);
+ 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");
+
+ String carId = (String) para.get("carId");
+ String carPlate = "";
+ Map<String,Object> syResult = sYClient.getCarNearPositionByCarId(syURL, carId, ardSyUser.getUserId(), sessionId);
+ if(((String)syResult.get("rspCode")).equals("1")){
+ Map<String,Object> carMap = ((List<Map<String,Object>>)syResult.get("list")).get(0);
+ carPlate = (String) carMap.get("carPlate");
+ }
+
+ //鍒嗛〉灞炴��
+ Integer pageNum = (Integer) para.get("pageNum");
+ Integer pageSize = (Integer) para.get("pageSize");
+
+ PageHelper.startPage(pageNum, pageSize);//鍒嗛〉
+ Map<String,Object> resultMap = new HashMap();
+ List<Map<String,Object>> resultList = ardTankLockPasswordMapper.getLockPasswordByCarId(carId);
+ for(Map<String,Object> map : resultList){
+ map.put("carPlate",carPlate);
+ }
+
+ Long total = ardTankLockPasswordMapper.selectLockPasswordTotalByCarId(carId);
+ resultMap.put("list",resultList);
+ resultMap.put("total",total);
+ return resultMap;
+ }
}
--
Gitblit v1.9.3