From a59200e76cfd8795c35e021780c556c1b3fc9e7e Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期三, 07 八月 2024 09:28:49 +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 | 11 +++++++++++
ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java | 8 ++++----
ard-work/src/main/java/com/ruoyi/sy/service/impl/ArdTankLockProcessLogServiceImpl.java | 11 +++++++++++
4 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
index 2582ec2..0b9dd22 100644
--- a/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
+++ b/ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java
@@ -609,7 +609,7 @@
/**
* 鑾峰彇鏈寕鎺ユ潈闄愮殑涓変竴杞﹁締
*/
-// @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarNoRight')")
@PostMapping("/getArdSyCarNoRight")
@ApiOperation("鑾峰彇鏈寕鎺ユ潈闄愮殑涓変竴杞﹁締")
public Map<String,Object> getArdSyCarNoRight(){
@@ -627,7 +627,7 @@
/**
* 鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締
*/
-// @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getArdSyCarAll')")
@PostMapping("/getArdSyCarAll")
@ApiOperation("鑾峰彇鍏ㄩ儴鐨勪笁涓�杞﹁締")
public Map<String,Object> getArdSyCarAll(){
@@ -645,7 +645,7 @@
/**
* 鑾峰彇鍏ㄩ儴杞﹁締妯″瀷
*/
-// @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
+ @PreAuthorize("@ss.hasPermi('sy:syCar:getAllCarModel')")
@PostMapping("/getAllCarModel")
@ApiOperation("鑾峰彇鍏ㄩ儴杞﹁締妯″瀷")
public Map<String,Object> getAllCarModel(){
@@ -712,7 +712,7 @@
}
}
- // @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
+ @PreAuthorize("@ss.hasPermi('sy:syCar:carListById')")
@PostMapping("/carListById/{id}")
@ApiOperation("鏍规嵁杞﹁締ID鑾峰彇杞﹁締鍒楄〃")
public Results carListById(@PathVariable String id){
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 1bb9587..f50f023 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
@@ -8,6 +8,7 @@
import com.github.pagehelper.PageInfo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.sy.domain.ArdTankLockProcessLog;
import com.ruoyi.sy.domain.ArdTankWall;
import com.ruoyi.sy.service.*;
import com.ruoyi.utils.result.Results;
@@ -439,4 +440,14 @@
dataTable.setMsg("鏌ヨ鎴愬姛");
return dataTable;
}
+
+ /*@ApiOperation("鏍规嵁杞︾墝鍙峰鍑虹數纾侀攣鎵嬪姩鎿嶆帶璁板綍")
+ @PreAuthorize("@ss.hasPermi('sy:lock:exportArdTankLockProcessLog')")
+ @PostMapping("/exportArdTankLockProcessLog")
+ public void exportArdTankLockProcessLog(HttpServletResponse response, ArdTankLockProcessLog ardTankLockProcessLog) {
+ List<ArdTankLockProcessLog> list = ardTankLockProcessLogService.exportArdTankLockProcessLog(ardTankLockProcessLog.getCarPlate());
+ ExcelUtil<ArdTankLockProcessLog> util = new ExcelUtil<ArdTankLockProcessLog>(ArdTankLockProcessLog. class);
+ util.exportExcel(response, list, "缃愯溅閿佹搷鎺ф棩蹇楁暟鎹�");
+ }*/
+
}
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 0a16aad..76c85f0 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
@@ -67,4 +67,6 @@
public void autoProcessArdTankLockByLockId(Map<String,Object> gpsMap);
public Map<String,Object> getArdTankLockProcessLogByCarPlate(Map<String,Object> para);
+
+ public List<ArdTankLockProcessLog> exportArdTankLockProcessLog(String carPlate);
}
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 064e034..0761bbb 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
@@ -613,6 +613,17 @@
}
+ @Override
+ public List<ArdTankLockProcessLog> exportArdTankLockProcessLog(String carPlate) {
+ if(carPlate.equals("")){
+ List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogAll();
+ return resultList;
+ }else{
+ List<ArdTankLockProcessLog> resultList = ardTankLockProcessLogMapper.getArdTankLockProcessLogByCarPlate("%" + carPlate + "%");
+ return resultList;
+ }
+ }
+
public Map<String,Object> sendCmd(String syURL,String userId,String carId,Integer cmdId,String cmd,String paramsStr,String sessionId){
OkHttpClient okHttpClient = new OkHttpClient();
--
Gitblit v1.9.3