From 57c673aa3e83677bcf5d30b4b45d06bae6609db8 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: 星期四, 08 八月 2024 16:14:40 +0800
Subject: [PATCH] 优化：获取会话
---
ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 274 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 267 insertions(+), 7 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 48dd8f0..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
@@ -4,10 +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.ArdTankLockProcessLog;
import com.ruoyi.sy.domain.ArdTankWall;
-import com.ruoyi.sy.service.IArdTankWallService;
+import com.ruoyi.sy.service.*;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,7 +29,6 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.sy.domain.ArdTankLock;
-import com.ruoyi.sy.service.IArdTankLockService;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -45,6 +47,21 @@
@Autowired
private IArdTankWallService ardTankWallService;
+
+ @Autowired
+ private IArdTankWallLockService ardTankWallLockService;
+
+ @Autowired
+ private IArdTankLockProcessLogService ardTankLockProcessLogService;
+
+ @Autowired
+ private IArdTankLockAlarmService ardTankLockAlarmService;
+
+ @Autowired
+ private IArdTankLockPasswordService ardTankLockPasswordService;
+
+ @Autowired
+ private IArdTankWallTemporaryService ardTankWallTemporaryService;
/**
* 鏌ヨ鐢电閿佸垪琛�
@@ -142,12 +159,53 @@
@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;
+ }
+
+ /**
+ * 鏍规嵁car_id鑾峰彇鐢电閿佽缁嗕俊鎭�
+ */
+ @ApiOperation("鏍规嵁car_id鑾峰彇鐢电閿佽缁嗕俊鎭�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getLockByCarId')")
+ @PostMapping("/getLockByCarId")
+ public AjaxResult getLockByCarId(@RequestBody ArdTankLock ardTankLock) {
+ String userId = SecurityUtils.getUserId();
+ return success(ardTankLockService.getLockByCarId(ardTankLock.getCarId(),userId));
+ }
+
+ /**
+ * 鏍规嵁car_id鍒犻櫎鐢电閿�
+ */
+ @ApiOperation("鏍规嵁car_id鍒犻櫎鐢电閿�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:deleteLockByCarId')")
+ @PostMapping("/deleteLockByCarId")
+ public AjaxResult deleteLockByCarId(@RequestBody ArdTankLock ardTankLock) {
+ return toAjax(ardTankLockService.deleteLockByCarId(ardTankLock.getCarId()));
+ }
+
+ @ApiOperation("淇敼鐢电閿�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:updateLockByCarId')")
+ @Log(title = "鐢电閿�" , businessType = BusinessType.UPDATE)
+ @PutMapping("/updateLockByCarId")
+ public AjaxResult updateLockByCarId(@RequestBody Map<String,Object> para) {
+ return toAjax(ardTankLockService.updateLockByCarId(para));
}
/**
@@ -183,11 +241,213 @@
return toAjax(ardTankWallService.deleteArdTankWallById(id));
}
- @ApiOperation("鏌ヨ鍏ㄩ儴鐢靛瓙鍥存爮")
+ /*@ApiOperation("鏌ヨ鍏ㄩ儴鐢靛瓙鍥存爮")
@PreAuthorize("@ss.hasPermi('sy:lock:getAllArdTankWall')")
@GetMapping("/getAllArdTankWall")
public Results getAllArdTankWall() {
List<ArdTankWall> result = ardTankWallService.getAllArdTankWall();
return Results.succeed(result);
+ }*/
+
+ @ApiOperation("鏌ヨ鍏ㄩ儴鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getAllArdTankWall')")
+ @PostMapping("/getAllArdTankWall")
+ 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);*/
+ 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("鏍规嵁涓婚敭鑾峰彇鐢电閿佺數瀛愬洿鏍�")
+ @PreAuthorize("@ss.hasPermi('sy:tankWall:getArdTankWallById')")
+ @GetMapping(value = "/getArdTankWallById/{id}")
+ public AjaxResult getArdTankWallById(@PathVariable String id) {
+ return success(ardTankWallService.selectArdTankWallById(id));
+ }
+
+ /**
+ * 妯＄硦鏌ヨ鐢电閿佸強鎸傛帴鐨勮溅杈�
+ */
+ @ApiOperation("妯＄硦鏌ヨ鐢电閿佸強鎸傛帴鐨勮溅杈�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getLockByCarPlate')")
+ @PostMapping("/getLockByCarPlate")
+ 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);*/
+ //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 ardTankLockProcessLogService.processArdTankLockByLockId(userId,username,para);
+ }
+
+ @ApiOperation("鏌ヨ鐢电閿佹姤璀�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getAlarm')")
+ @PostMapping("/getAlarm")
+ public TableDataInfo getAlarm(@RequestBody Map<String,Object> para) {
+ String userId = SecurityUtils.getUserId();
+ Map<String,Object> result = ardTankLockAlarmService.getAlarm(userId,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;
+ }
+
+ @ApiOperation("鏍规嵁閿佷富閿煡璇㈢數纾侀攣瀵嗙爜")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getLockPasswordByLockId')")
+ @PostMapping("/getLockPasswordByLockId")
+ public TableDataInfo getLockPasswordByLockId(@RequestBody Map<String,Object> para) {
+ Map<String,Object> result = ardTankLockPasswordService.getLockPasswordByLockId(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;
+ }
+
+ @ApiOperation("鏍规嵁涓変竴涓婚敭鏌ヨ鐢电閿佸瘑鐮�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getLockPasswordByCarId')")
+ @PostMapping("/getLockPasswordByCarId")
+ public TableDataInfo getLockPasswordByCarId(@RequestBody Map<String,Object> para) {
+ String userId = SecurityUtils.getUserId();
+ Map<String,Object> result = ardTankLockPasswordService.getLockPasswordByCarId(userId,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;
+ }
+
+ @ApiOperation("鏂板涓存椂鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:insertArdTankWallTemporary')")
+ @PostMapping("/insertArdTankWallTemporary")
+ public AjaxResult insertArdTankWallTemporary(@RequestBody Map<String,Object> para) {
+ String userId = SecurityUtils.getUserId();
+ String userName = SecurityUtils.getUsername();
+ return toAjax(ardTankWallTemporaryService.insertArdTankWallTemporary(userId,userName,para));
+ }
+
+ @ApiOperation("鏇存敼涓存椂鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:updateArdTankWallTemporary')")
+ @PostMapping("/updateArdTankWallTemporary")
+ public AjaxResult updateArdTankWallTemporary(@RequestBody Map<String,Object> para) {
+ String userId = SecurityUtils.getUserId();
+ String userName = SecurityUtils.getUsername();
+ return toAjax(ardTankWallTemporaryService.updateArdTankWallTemporary(userId,userName,para));
+ }
+
+ @ApiOperation("鏍规嵁涓変竴涓婚敭鏌ヨ涓存椂鐢靛瓙鍥存爮")
+ @PreAuthorize("@ss.hasPermi('sy:lock:getArdTankWallTemporaryByCarId')")
+ @PostMapping("/getArdTankWallTemporaryByCarId")
+ public TableDataInfo getArdTankWallTemporaryByCarId(@RequestBody Map<String,Object> para) {
+ Map<String,Object> result = ardTankWallTemporaryService.getArdTankWallTemporaryByCarId(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;
+ }
+
+ @ApiOperation("淇敼鐢电閿佷娇鑳�")
+ @PreAuthorize("@ss.hasPermi('sy:lock:updateLockEnableByCarId')")
+ @Log(title = "鐢电閿�" , businessType = BusinessType.UPDATE)
+ @PutMapping("/updateLockEnableByCarId")
+ 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;
+ }
+
+ /*@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, "缃愯溅閿佹搷鎺ф棩蹇楁暟鎹�");
+ }*/
+
}
--
Gitblit v1.9.3