From 4c133c297ff25eddd1a30a4bce032affb334969a Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 30 七月 2024 09:19:30 +0800
Subject: [PATCH] 三一车辆查询bug修改及电磁锁状态修改提交
---
ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml | 5 ++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java | 14 ++++++
ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml | 7 +++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java | 2 +
ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml | 7 ---
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java | 22 ++++++++++-
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockStateMapper.java | 3 +
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java | 5 +-
8 files changed, 53 insertions(+), 12 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
index e73605b..f7f3dfb 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdSyCarMapper.java
@@ -94,4 +94,6 @@
public List<ArdSyCar> getCarListByDeptIdList(@Param("deptIdList") List<Long> deptIdList);
public List<ArdSyCar> selectArdSyCarAndTankLockByUserId(String userId);
+
+ public List<ArdSyCar> selectByBrandAndType(@Param("carBrand")String carBrand,@Param("carType")String carType);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockStateMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockStateMapper.java
index d18bf37..530efa0 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockStateMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockStateMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.sy.domain.ArdTankLockState;
+import org.apache.ibatis.annotations.Param;
/**
* 缃愯溅閿佺姸鎬丮apper鎺ュ彛
@@ -62,4 +63,6 @@
public int insertOrUpdateArdTankLockState(ArdTankLockState ardTankLockState);
public ArdTankLockState selectArdTankLockStateByLockIdLimitOne(String lockId);
+
+ public int updateArdTankLockStateByUniqueMark(@Param("uniqueMark") String uniqueMark,@Param("uploadTime") String uploadTime);
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
index e50c863..1aa0bbf 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdSyCarServiceImpl.java
@@ -134,10 +134,11 @@
@Override
public AjaxResult ardSyCarList(ArdSyCarParam ardSyCarParam,Map<String,Object> result) {
- QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
+ /*QueryWrapper<ArdSyCar> queryWrapper = new QueryWrapper<>();
queryWrapper.like(ardSyCarParam.getCarBrand()!=null,"car_brand",ardSyCarParam.getCarBrand())
.like(ardSyCarParam.getCarType()!=null,"car_type",ardSyCarParam.getCarType());
- List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);
+ List<ArdSyCar> ardSyCars = ardSyCarMapper.selectList(queryWrapper);*/
+ List<ArdSyCar> ardSyCars = ardSyCarMapper.selectByBrandAndType(ardSyCarParam.getCarBrand(),ardSyCarParam.getCarType());
List<ArdSyCarVo> ardSyCarVoList = new ArrayList<>();
if(((String)result.get("code")).equals("200")){
List<Map<String,Object>> list = (List<Map<String, Object>>) result.get("data");
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 f912eaf..f76dc25 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
@@ -227,12 +227,30 @@
ardTankLockProcessLog.setProcessTime(this.sdf.format(new Date()));
ardTankLockProcessLogMapper.insertArdTankLockProcessLog(ardTankLockProcessLog);
return AjaxResult.success("鍙戦�佹垚鍔�");
- }else{
+ }else if(((String)result.get("rspCode")).equals("-6")){
+ return AjaxResult.error("鎵句笉鍒拌溅杈�");
+ }else if(((String)result.get("rspCode")).equals("-5")){
+ return AjaxResult.error("鎵句笉鍒扮敤鎴�");
+ }else if(((String)result.get("rspCode")).equals("-4")){
+ return AjaxResult.error("鎵句笉鍒版寚浠�");
+ }else if(((String)result.get("rspCode")).equals("-3")){
+ return AjaxResult.error("鎸囦护鍙戦�佽秴鏃�");
+ }else if(((String)result.get("rspCode")).equals("-2")){
+ return AjaxResult.error("绂荤嚎寰呭彂");
+ }else if(((String)result.get("rspCode")).equals("-1")){
+ return AjaxResult.error("杞﹁締绂荤嚎");
+ }else if(((String)result.get("rspCode")).equals("1")){
return AjaxResult.error("鍙戦�佸け璐�");
+ }else if(((String)result.get("rspCode")).equals("2")){
+ return AjaxResult.error("娑堟伅鏈夎");
+ }else if(((String)result.get("rspCode")).equals("3")){
+ return AjaxResult.error("涓嶆敮鎸�");
+ }else{
+ return AjaxResult.error("鍏朵粬鍘熷洜鍙戦�佸け璐�");
}
}catch(Exception e){
e.printStackTrace();
- return AjaxResult.error("鍙戦�佸け璐�");
+ return AjaxResult.error("鍙戦�佸け璐�" + e.toString());
}
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java
index 6471083..704a386 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockStateServiceImpl.java
@@ -99,7 +99,7 @@
@Override
public int insertOrUpdateArdTankLockState(ArdTankLockState ardTankLockState) {
- int result = ardTankLockStateMapper.insertOrUpdateArdTankLockState(ardTankLockState);
+ /*int result = ardTankLockStateMapper.insertOrUpdateArdTankLockState(ardTankLockState);
try{
return result;
}finally {
@@ -107,6 +107,18 @@
ardTankLock.setId(ardTankLockState.getLockId());
ardTankLock.setOnlineTime(ardTankLockState.getUploadTime());
ardTankLockMapper.updateArdTankLock(ardTankLock);//鏇存敼鐘舵��
+ }*/
+ try{
+ int result = ardTankLockStateMapper.insertArdTankLockState(ardTankLockState);
+ return result;
+ }catch(Exception e){
+ int result = ardTankLockStateMapper.updateArdTankLockStateByUniqueMark(ardTankLockState.getUniqueMark(),ardTankLockState.getUploadTime());
+ return result;
+ }finally {
+ ArdTankLock ardTankLock = new ArdTankLock();
+ ardTankLock.setId(ardTankLockState.getLockId());
+ ardTankLock.setOnlineTime(ardTankLockState.getUploadTime());
+ ardTankLockMapper.updateArdTankLock(ardTankLock);//鏇存敼鐘舵��
}
}
}
diff --git a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
index 104d743..23e4643 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdSyCarMapper.xml
@@ -180,4 +180,11 @@
)
select dept_id from rsd) order by "asc".car_id desc,atl.lock_num
</select>
+ <select id="selectByBrandAndType" resultMap="ArdSyCarResult" parameterType="java.lang.String">
+ select * from ard_sy_car
+ <where>
+ <if test="carType != null and carType != ''"> and car_type = #{carType}</if>
+ <if test="carBrand != null and carBrand != ''"> and car_brand = #{carBrand}</if>
+ </where>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml
index 8ad2d69..2b33a47 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankLockStateMapper.xml
@@ -125,4 +125,9 @@
where atls.lock_id = #{lockId} order by atls.upload_time desc
limit 1
</select>
+
+ <update id="updateArdTankLockStateByUniqueMark" parameterType="java.lang.String">
+ update ard_tank_lock_state set upload_time = #{uploadTime}
+ where unique_mark = #{uniqueMark}
+ </update>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
index 125528f..74a49be 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankWallMapper.xml
@@ -98,11 +98,4 @@
inner join ard_tank_wall atw on atwl.wall_id = atw.id
where atwl.lock_id = #{lockId} and atwl.process_type != '0'
</select>
-
- <select id="getDistinctArdTankWallByCarId" resultMap="ArdTankWallResult" parameterType="java.lang.String">
- select distinct atw.* from ard_tank_lock atl
- inner join ard_tank_wall_lock atwl on atl.id = atwl.lock_id
- inner join ard_tank_wall atw on atwl.wall_id = atw.id
- where atl.car_id = #{carId}
- </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3