2021与蓝度共同重构项目,服务端
fix
zhanzhiqin
2022-07-05 72046386cf8a85ad7dae79d82485fa60c2c421e6
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -361,7 +361,7 @@
        //排序方式
        String orderBy = orderByResult + " " + orderBySeq;
//        PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
        PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
        List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(),keyword,orderBy);
@@ -534,16 +534,6 @@
        if (!removeByIds(taskIdList)) {
            throw new BusinessException("删除任务失败");
        }
        boolean del;
        // 删除绑定灯杆
//        if (!lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).notIn(LightTaskPoleRelation::getTaskId, taskIdList))) {
//            throw new BusinessException("未找到任务/灯杆绑定关系");
//        }
//        lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).in(LightTaskPoleRelation::getTaskId, taskIdList));
        taskIdList.forEach(taskId -> {
            lightTaskPoleRelationService.remove(Wrappers.lambdaQuery(LightTaskPoleRelation.class).eq(LightTaskPoleRelation::getTaskId, taskId));
        });
        /**
         * 删除控灯任务日志记录开始