From 4dbd2e0a473ef33ecf8a7200f62b61d4dbd87f25 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期二, 06 八月 2024 10:31:45 +0800
Subject: [PATCH] 电磁锁主动操控记录查询提交
---
ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockProcessLogService.java | 2 +
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 14 +++++++
ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockProcessLogMapper.java | 9 ++++
ard-work/src/main/resources/mapper/sy/ArdTankLockProcessLogMapper.xml | 17 ++++++++
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java | 25 ++++++++++++
5 files changed, 67 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
index 8bb2520..1bb9587 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java
@@ -425,4 +425,18 @@
public AjaxResult updateLockEnableByCarId(@RequestBody Map<String,Object> para) {
return toAjax(ardTankLockService.updateLockEnableByCarId(para));
}
+
+ @ApiOperation("鏍规嵁杞︾墝鍙锋煡璇㈢數纾侀攣鎵嬪姩鎿嶆帶璁板綍")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getArdTankLockProcessLogByCarPlate')")
+ @PostMapping("/getArdTankLockProcessLogByCarPlate")
+ public TableDataInfo getArdTankLockProcessLogByCarPlate(@RequestBody Map<String,Object> para) {
+ Map<String,Object> result = ardTankLockProcessLogService.getArdTankLockProcessLogByCarPlate(para);
+
+ TableDataInfo dataTable = new TableDataInfo();
+ dataTable.setRows((List<Map<String,Object>>) result.get("list"));
+ dataTable.setTotal((Long) result.get("total"));
+ dataTable.setCode(200);
+ dataTable.setMsg("鏌ヨ鎴愬姛");
+ return dataTable;
+ }
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockProcessLogMapper.java b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockProcessLogMapper.java
index 7ff13ba..6d73db7 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockProcessLogMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/mapper/ArdTankLockProcessLogMapper.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.ruoyi.sy.domain.ArdTankLockProcessLog;
+import org.apache.ibatis.annotations.Param;
/**
* 缃愯溅閿佹搷鎺ф棩蹇桵apper鎺ュ彛
@@ -58,4 +59,12 @@
* @return 缁撴灉
*/
public int deleteArdTankLockProcessLogByIds(String[] ids);
+
+ public List<ArdTankLockProcessLog> getArdTankLockProcessLogByCarPlate(String carPlate);
+
+ public Long getArdTankLockProcessLogTotalByCarPlate(String carPlate);
+
+ public List<ArdTankLockProcessLog> getArdTankLockProcessLogAll();
+
+ public Long getArdTankLockProcessLogTotal();
}
diff --git a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockProcessLogService.java b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockProcessLogService.java
index 713604a..0a16aad 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockProcessLogService.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/service/IArdTankLockProcessLogService.java
@@ -65,4 +65,6 @@
public AjaxResult processArdTankLockByLockId(String userId, String username, Map<String,String> para);
public void autoProcessArdTankLockByLockId(Map<String,Object> gpsMap);
+
+ public Map<String,Object> getArdTankLockProcessLogByCarPlate(Map<String,Object> para);
}
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 d1d5335..064e034 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
@@ -6,6 +6,7 @@
import java.util.*;
import com.alibaba.fastjson2.JSON;
+import com.github.pagehelper.PageHelper;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.common.utils.uuid.IdUtils;
@@ -588,6 +589,30 @@
}
}
+ @Override
+ public Map<String, Object> getArdTankLockProcessLogByCarPlate(Map<String, Object> para) {
+ //鍒嗛〉灞炴��
+ Integer pageNum = (Integer) para.get("pageNum");
+ Integer pageSize = (Integer) para.get("pageSize");
+
+ PageHelper.startPage(pageNum, pageSize);//鍒嗛〉
+ Map<String,Object> resultMap = new HashMap();
+ if(((String) para.get("carPlate")).equals("")){
+ List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogAll();
+ Long total = ardTankLockProcessLogMapper.getArdTankLockProcessLogTotal();
+ resultMap.put("list",resultList);
+ resultMap.put("total",total);
+ return resultMap;
+ }else{
+ List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogByCarPlate("%" + (String) para.get("carPlate") + "%");
+ Long total = ardTankLockProcessLogMapper.getArdTankLockProcessLogTotalByCarPlate("%" + (String) para.get("carPlate") + "%");
+ resultMap.put("list",resultList);
+ resultMap.put("total",total);
+ return resultMap;
+ }
+
+ }
+
public Map<String,Object> sendCmd(String syURL,String userId,String carId,Integer cmdId,String cmd,String paramsStr,String sessionId){
OkHttpClient okHttpClient = new OkHttpClient();
diff --git a/ard-work/src/main/resources/mapper/sy/ArdTankLockProcessLogMapper.xml b/ard-work/src/main/resources/mapper/sy/ArdTankLockProcessLogMapper.xml
index 0e43b9b..9019f84 100644
--- a/ard-work/src/main/resources/mapper/sy/ArdTankLockProcessLogMapper.xml
+++ b/ard-work/src/main/resources/mapper/sy/ArdTankLockProcessLogMapper.xml
@@ -105,4 +105,21 @@
#{id}
</foreach>
</delete>
+
+ <select id="getArdTankLockProcessLogByCarPlate" parameterType="java.lang.String" resultMap="ArdTankLockProcessLogResult">
+ select * from ard_tank_lock_process_log where car_plate like #{carPlate}
+ order by process_time desc
+ </select>
+
+ <select id="getArdTankLockProcessLogTotalByCarPlate" parameterType="java.lang.String" resultType="java.lang.Long">
+ select count(*) from ard_tank_lock_process_log where car_plate like #{carPlate}
+ </select>
+
+ <select id="getArdTankLockProcessLogAll" parameterType="java.lang.String" resultMap="ArdTankLockProcessLogResult">
+ select * from ard_tank_lock_process_log order by process_time desc
+ </select>
+
+ <select id="getArdTankLockProcessLogTotal" parameterType="java.lang.String" resultType="java.lang.Long">
+ select count(*) from ard_tank_lock_process_log
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3