bug修复

liuhaonan

2022-06-23 9c492592e4360d1a517d75847e9049e0cc1a3b2c

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightTaskController.java

@@ -2,6 +2,7 @@

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.param.LightTaskDelParam;
@@ -44,12 +45,16 @@
        }
    }

    @AnonymousAccess
    @GetMapping("/list")
    public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword);
    public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO,
                                            @RequestParam(value = "keyword", required = false) String keyword,
                                            @RequestParam(value = "order", required = false) Integer order,
                                            @RequestParam(value = "seq", required = false) Integer seq) {
//        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_LIST.getCode())) {
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
        List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword, order, seq);
        return ResponseUtil.successPage(taskList);
    }

@@ -71,16 +76,8 @@
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        int result = lightTaskService.updateLightTask(taskId, param);
        if(result==0){
            return ResponseUtil.success("编辑成功");
        }else if(result==1){
            return ResponseUtil.success("原任务存在发送指令异常,旧任务保留,下发成功的部分保存至对应新增任务");
        }else if(result==2){
            return ResponseUtil.fail("原任务存在发送指令异常,任务下发失败,旧任务保留");
        }else {
            return ResponseUtil.fail("未知错误");
        }
        String result = lightTaskService.updateLightTask(taskId, param);
        return ResponseUtil.success(result);

    }