fix

zhanzhiqin

2022-07-05 72046386cf8a85ad7dae79d82485fa60c2c421e6

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java

@@ -333,16 +333,6 @@
    }

    public List<LightTaskDto> listLightTask(BaseConditionVO conditionVO, String keyword, Integer order, Integer seq) {
//        LambdaQueryWrapper<LightTask> wrapper = Wrappers.lambdaQuery(LightTask.class);
//        if (StrUtil.isNotBlank(keyword)) {
//            wrapper.like(LightTask::getTaskName, keyword);
//        }
//        //不是超管需要筛选
//        if (SecurityUtils.getClientId() != null) {
//            wrapper.eq(LightTask::getClientId, SecurityUtils.getUserId()).or(w -> {
//                w.eq(LightTask::getUserId, SecurityUtils.getUserId());
//            });
//        }

        //排序字段
        String orderByResult = "task_id";
@@ -372,7 +362,7 @@
        String orderBy = orderByResult + " " + orderBySeq;

        PageHelper.startPage(conditionVO.getPageNo(), conditionVO.getPageSize(), orderBy);
        List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(),keyword);
        List<LightTask> list = baseMapper.listTask(SecurityUtils.getClientId(),keyword,orderBy);


        Page<LightTaskDto> page = new Page<>();
@@ -544,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));
        });

        /**
         * 删除控灯任务日志记录开始