单灯任务返回指令修改

liuhaonan

2022-05-23 bf5d9682beb8fa53c5adbd14bb3e458c1c859038

 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,12 +27,15 @@
@AllArgsConstructor
@RequestMapping("/v1/light/task")
public class LightTaskController {

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

    @PostMapping("/add")
    public ResponseVO<Object> addLightTask(@RequestBody @Validated LightTaskParam param) {
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ADD.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = lightTaskService.addLightTask(param);
        if (result) {
            return ResponseUtil.success("新增成功");
@@ -42,16 +45,19 @@
    }

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

    @PostMapping("/del")
    public ResponseVO<Object> delLightTask(@RequestBody @Validated LightTaskDelParam param) {
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DELETE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = lightTaskService.delLightTask(param.getTaskIdList());
        if (result) {
            return ResponseUtil.success("删除成功");
@@ -62,22 +68,42 @@

    @PostMapping("/update/{taskId}")
    public ResponseVO<Object> updateLightTask(@PathVariable Long taskId, @RequestBody @Validated LightTaskParam param) {
        boolean result = lightTaskService.updateLightTask(taskId, param);
        if (result) {
            return ResponseUtil.success("编辑成功");
        } else {
            return ResponseUtil.fail("编辑失败");
        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("未知错误");
        }

    }

    @GetMapping("/{taskId}")
    public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_DETAIL.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        Map<Object, Object> objectObjectMap = lightTaskService.detailLightTask(taskId);
        return ResponseUtil.success(objectObjectMap);
    }

    /**
     * 单灯下发
     *
     * @param param
     * @return
     */
    @PostMapping("/issue")
    public ResponseVO<Object> issueLightTask(@RequestBody @Validated LightTaskIssueParam param) {
        if (!permissionConfig.check(MenuEnum.LIGHT_TASK_ISSUE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = lightTaskService.issueLightTask(param);
        if (result) {
            return ResponseUtil.success("下发成功");
@@ -85,4 +111,15 @@
            return ResponseUtil.fail("下发失败");
        }
    }


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


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


}