From 55811ddff81bc142eac3c27e44f30c55e84311f1 Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期六, 20 七月 2024 13:25:19 +0800
Subject: [PATCH] 三一车辆遗漏提交
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 107 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 97 insertions(+), 10 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 5a47087..fe15822 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
@@ -4,9 +4,13 @@
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.sy.domain.ArdTankWall;
+import com.ruoyi.sy.service.IArdTankLockProcessLogService;
+import com.ruoyi.sy.service.IArdTankWallLockService;
import com.ruoyi.sy.service.IArdTankWallService;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
@@ -45,6 +49,12 @@
@Autowired
private IArdTankWallService ardTankWallService;
+
+ @Autowired
+ private IArdTankWallLockService ardTankWallLockService;
+
+ @Autowired
+ private IArdTankLockProcessLogService ardTankLockProcessLogService;
/**
* 鏌ヨ鐢电閿佸垪琛�
@@ -142,12 +152,24 @@
@ApiOperation("鏌ヨ鍏ㄩ儴鐢电閿�")
@PreAuthorize("@ss.hasPermi('sy:lock:getAll')")
- @GetMapping("/getAll")
- public TableDataInfo getAll() {
- startPage();
+ //@GetMapping("/getAll")
+ @PostMapping("/getAll")
+ public TableDataInfo getAll(@RequestBody Map<String,Integer> para) {
+ /*startPage();
String userId = SecurityUtils.getUserId();
List<Map<String,Object>> result = ardTankLockService.getAll(userId);
- return getDataTable(result);
+ return getDataTable(result);*/
+
+ PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
+ String userId = SecurityUtils.getUserId();
+ Map<String,Object> result = ardTankLockService.getAll(userId);
+
+ 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;
}
/**
@@ -223,10 +245,23 @@
@ApiOperation("鏌ヨ鍏ㄩ儴鐢靛瓙鍥存爮")
@PreAuthorize("@ss.hasPermi('sy:lock:getAllArdTankWall')")
@PostMapping("/getAllArdTankWall")
- public TableDataInfo getAllArdTankWall(@RequestBody ArdTankWall ardTankWall) {
- startPage();
+ public TableDataInfo getAllArdTankWall(@RequestBody Map<String,Object> para) {
+ /*startPage();
+ ArdTankWall ardTankWall = new ArdTankWall();
+ ardTankWall.setWallName((String) para.get("wallName"));
List<ArdTankWall> list = ardTankWallService.selectArdTankWallList(ardTankWall);
- return getDataTable(list);
+ return getDataTable(list);*/
+ PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
+ ArdTankWall ardTankWall = new ArdTankWall();
+ ardTankWall.setWallName((String) para.get("wallName"));
+ Map<String,Object> result = ardTankWallService.selectArdTankWallList(ardTankWall);
+
+ TableDataInfo dataTable = new TableDataInfo();
+ dataTable.setRows((List<ArdTankWall>) result.get("list"));
+ dataTable.setTotal((Long) result.get("total"));
+ dataTable.setCode(200);
+ dataTable.setMsg("鏌ヨ鎴愬姛");
+ return dataTable;
}
@ApiOperation("鏍规嵁涓婚敭鑾峰彇鐢电閿佺數瀛愬洿鏍�")
@@ -242,10 +277,62 @@
@ApiOperation("妯＄硦鏌ヨ鐢电閿佸強鎸傛帴鐨勮溅杈�")
@PreAuthorize("@ss.hasPermi('sy:lock:getLockByCarPlate')")
@PostMapping("/getLockByCarPlate")
- public TableDataInfo getLockByCarPlate(@RequestBody Map<String,String> para) {
- startPage();
+ public TableDataInfo getLockByCarPlate(@RequestBody Map<String,Object> para) {
+ /*startPage();
String userId = SecurityUtils.getUserId();
List<Map<String,String>> result = ardTankLockService.getLockByCarPlate(userId,para.get("carPlate"));
- return getDataTable(result);
+ return getDataTable(result);*/
+ //PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
+ String userId = SecurityUtils.getUserId();
+ Map<String,Object> result = ardTankLockService.getLockByCarPlate(userId, (String) para.get("carPlate"),(Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
+
+ 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;
+ }
+
+ @ApiOperation("鏍规嵁閿佷富閿幏鍙栫數瀛愬洿鏍�")
+ @PreAuthorize("@ss.hasPermi('sy:tankWall:getArdTankWallByLockId')")
+ @GetMapping(value = "/getArdTankWallByLockId/{id}")
+ public AjaxResult getArdTankWallByLockId(@PathVariable String id) {
+ return success(ardTankWallService.getArdTankWallByLockId(id));
+ }
+
+ /**
+ * 鎸傛帴鐢电閿佸強鐢靛瓙鍥存爮
+ */
+ @ApiOperation("鎸傛帴鐢电閿佸強鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:insertWallLock')")
+ @PostMapping("/insertWallLock")
+ public AjaxResult insertWallLock(@RequestBody Map<String,Object> para) {
+ int result = ardTankWallLockService.insertWallLock(para);
+ return toAjax(result);
+ }
+
+ /**
+ * 鏍规嵁閿佷富閿垹闄ゆ寕鎺ョ殑鐢靛瓙鍥存爮
+ */
+ @ApiOperation("鏍规嵁閿佷富閿垹闄ゆ寕鎺ョ殑鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:deleteArdTankWallLockByLockId')")
+ @Log(title = "鐢电閿�" , businessType = BusinessType.DELETE)
+ @DeleteMapping("/deleteArdTankWallLockByLockId/{id}")
+ public AjaxResult deleteArdTankWallLockByLockId(@PathVariable String id) {
+ return toAjax(ardTankWallLockService.deleteArdTankWallLockByLockId(id));
+ }
+
+ /**
+ * 鎿嶆帶鐢电閿�
+ */
+ @ApiOperation("鎿嶆帶鐢电閿�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:processArdTankLockByLockId')")
+ @Log(title = "鐢电閿�" , businessType = BusinessType.INSERT)
+ @PostMapping("/processArdTankLockByLockId")
+ public AjaxResult processArdTankLockByLockId(@RequestBody Map<String,String> para) {
+ String userId = SecurityUtils.getUserId();
+ String username = SecurityUtils.getUsername();
+ return AjaxResult.success(ardTankLockProcessLogService.processArdTankLockByLockId(userId,username,para));
}
}
--
Gitblit v1.9.3