changes

liuhaonan

2022-09-06 4791362c19d2d27a51593d625abb24173d1c63f2

 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;
@@ -36,13 +37,9 @@
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ADD.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = lightTaskService.addLightTask(param);
        if (result) {
            return ResponseUtil.success("新增成功");
        } else {
            return ResponseUtil.fail("新增失败");
        }
            return ResponseUtil.success(lightTaskService.newAddLightTask(param));
    }


    @GetMapping("/list")
    public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO,
@@ -74,24 +71,26 @@
        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 if (result == 3) {
//            return ResponseUtil.fail("部分成功，部分失败");
//        } else {
//            return ResponseUtil.fail("未知错误");
//        }

        String result = lightTaskService.updateLightTask(taskId, param);
        return ResponseUtil.success(result);

    }


    /**
     * 清除任务
     * @param
     * @return
     */
    @PostMapping("/clear")
    public ResponseVO<Object> clearLightTask(@RequestBody List<Long> poleIds) {
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = lightTaskService.clearLightTask(poleIds);
        return ResponseUtil.success(result);
    }

    @GetMapping("/{taskId}")
    public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DETAIL.getCode())) {