Merge remote-tracking branch 'origin/master'

liuhaonan

2022-05-20 91d11cc2c3b7a85494cd4ad0029310a1ae061d34

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

@@ -9,7 +9,6 @@
import com.sandu.ximon.admin.param.LightTaskParam;
import com.sandu.ximon.admin.security.PermissionConfig;
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;
@@ -45,7 +44,7 @@
    }

    @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("缺少对应用户权限");
        }
@@ -90,6 +89,7 @@

    /**
     * 单灯下发
     *
     * @param param
     * @return
     */
@@ -105,4 +105,13 @@
            return ResponseUtil.fail("下发失败");
        }
    }


    @PostMapping("/energy")
    public ResponseVO<Object> energy() {
        lightTaskService.energy();
        return ResponseUtil.success("true");
    }


}