修改：会话消息独立线程池；线程池参数统一设置

liusuyi

2024-08-01 60211f59d2c85053533ed151adb2bdc5348dd342

 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,15 @@

    @Autowired
    private IArdTankWallLockService ardTankWallLockService;

    @Autowired
    private IArdTankLockProcessLogService ardTankLockProcessLogService;

    @Autowired
    private IArdTankLockAlarmService ardTankLockAlarmService;

    @Autowired
    private IArdTankLockPasswordService ardTankLockPasswordService;

    /**
     * 查询电磁锁列表
@@ -158,11 +165,11 @@

        PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
        String userId = SecurityUtils.getUserId();
        List<Map<String,Object>> result = ardTankLockService.getAll(userId);
        Map<String,Object> result = ardTankLockService.getAll(userId);

        TableDataInfo dataTable = new TableDataInfo();
        dataTable.setRows(result);
        dataTable.setTotal(result.size());
        dataTable.setRows((List<Map<String,Object>>) result.get("list"));
        dataTable.setTotal((Long) result.get("total"));
        dataTable.setCode(200);
        dataTable.setMsg("查询成功");
        return dataTable;
@@ -250,11 +257,11 @@
        PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
        ArdTankWall ardTankWall = new ArdTankWall();
        ardTankWall.setWallName((String) para.get("wallName"));
        List<ArdTankWall> list = ardTankWallService.selectArdTankWallList(ardTankWall);
        Map<String,Object> result = ardTankWallService.selectArdTankWallList(ardTankWall);

        TableDataInfo dataTable = new TableDataInfo();
        dataTable.setRows(list);
        dataTable.setTotal(list.size());
        dataTable.setRows((List<ArdTankWall>) result.get("list"));
        dataTable.setTotal((Long) result.get("total"));
        dataTable.setCode(200);
        dataTable.setMsg("查询成功");
        return dataTable;
@@ -278,13 +285,13 @@
        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"));
        //PageHelper.startPage((Integer) para.get("pageNum"), (Integer) para.get("pageSize"));
        String userId = SecurityUtils.getUserId();
        List<Map<String,Object>> result = ardTankLockService.getLockByCarPlate(userId, (String) para.get("carPlate"));
        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(result);
        dataTable.setTotal(result.size());
        dataTable.setRows((List<Map<String,Object>>) result.get("list"));
        dataTable.setTotal((Long) result.get("total"));
        dataTable.setCode(200);
        dataTable.setMsg("查询成功");
        return dataTable;
@@ -318,4 +325,61 @@
    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;
    }
}