电磁锁报警查询bug修改提交

zhangnaisong

2024-07-27 6bab172dc8767e93c8889c15a146c76e4d38e9c0

 ard-work/src/main/java/com/ruoyi/sy/controller/ArdTankLockController.java

@@ -4,10 +4,12 @@
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.IArdTankWallService;
import com.ruoyi.sy.service.*;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -26,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;

@@ -45,6 +46,15 @@

    @Autowired
    private IArdTankWallService ardTankWallService;

    @Autowired
    private IArdTankWallLockService ardTankWallLockService;

    @Autowired
    private IArdTankLockProcessLogService ardTankLockProcessLogService;

    @Autowired
    private IArdTankLockAlarmService ardTankLockAlarmService;

    /**
     * 查询电磁锁列表
@@ -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,77 @@
    @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 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;
    }
}