From a6205cbf1a93ea8f77a771de2dbd68c8f1e52ebe Mon Sep 17 00:00:00 2001 From: zhangnaisong <2434969829@qq.com> Date: 星期五, 02 八月 2024 13:25:46 +0800 Subject: [PATCH] 电磁锁新增临时电子围栏查询修改提交 --- ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 102 insertions(+), 3 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 86cc3c3..1c46df5 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 @@ -9,8 +9,7 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.uuid.IdUtils; import com.ruoyi.sy.domain.ArdTankWall; -import com.ruoyi.sy.service.IArdTankWallLockService; -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; @@ -29,7 +28,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; @@ -51,6 +49,18 @@ @Autowired private IArdTankWallLockService ardTankWallLockService; + + @Autowired + private IArdTankLockProcessLogService ardTankLockProcessLogService; + + @Autowired + private IArdTankLockAlarmService ardTankLockAlarmService; + + @Autowired + private IArdTankLockPasswordService ardTankLockPasswordService; + + @Autowired + private IArdTankWallTemporaryService ardTankWallTemporaryService; /** * 鏌ヨ鐢电閿佸垪琛� @@ -318,4 +328,93 @@ 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; + } } -- Gitblit v1.9.3