bug修复

liuhaonan

2022-06-06 c54d9c2720c132fff2dc027343fbe3748ce6ecf7

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

@@ -8,8 +8,8 @@
import com.sandu.ximon.admin.param.LightTaskIssueParam;
import com.sandu.ximon.admin.param.LightTaskParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightEnergyDataService;
import com.sandu.ximon.admin.service.LightTaskService;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
@@ -27,7 +27,7 @@
@AllArgsConstructor
@RequestMapping("/v1/light/task")
public class LightTaskController {

    private final LightEnergyDataService lightEnergyDataService;
    private final LightTaskService lightTaskService;
    private PermissionConfig permissionConfig;

@@ -45,11 +45,14 @@
    }

    @GetMapping("/list")
    public ResponseVO<Object> listLightTask(BaseConditionVO conditionVO, @RequestParam(value = "keyword", required = false) String 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);
        List<LightTaskDto> taskList = lightTaskService.listLightTask(conditionVO, keyword, order, seq);
        return ResponseUtil.successPage(taskList);
    }

@@ -71,12 +74,9 @@
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_UPDATE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = lightTaskService.updateLightTask(taskId, param);
        if (result) {
            return ResponseUtil.success("编辑成功");
        } else {
            return ResponseUtil.fail("编辑失败");
        }
        String result = lightTaskService.updateLightTask(taskId, param);
        return ResponseUtil.success(result);

    }

    @GetMapping("/{taskId}")
@@ -106,4 +106,15 @@
            return ResponseUtil.fail("下发失败");
        }
    }


    @PostMapping("/energy")
    public ResponseVO<Object> energy() {


        lightTaskService.energy();
        return ResponseUtil.success("lightEnergyDataService.energy(0)");
    }


}