fix

zhanzhiqin

2022-04-22 1a8340a0bb7dd7cd72bb6ca5fb5a3e3accda2924

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

@@ -3,15 +3,20 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.LightTaskDto;
import com.sandu.ximon.admin.param.LightTaskDelParam;
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.LightTaskService;
import com.sandu.ximon.dao.domain.LightTask;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.Map;

/**
 * 路灯任务相关控制类
@@ -24,7 +29,7 @@
public class LightTaskController {

    private final LightTaskService lightTaskService;

    private PermissionConfig permissionConfig;

    @PostMapping("/add")
    public ResponseVO<Object> addLightTask(@RequestBody @Validated LightTaskParam param) {
@@ -38,7 +43,10 @@

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

@@ -54,11 +62,27 @@

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

    @GetMapping("/{taskId}")
    public ResponseVO<Object> detailLightTask(@PathVariable Long taskId) {
        Map<Object, Object> objectObjectMap = lightTaskService.detailLightTask(taskId);
        return ResponseUtil.success(objectObjectMap);
    }

    @PostMapping("/issue")
    public ResponseVO<Object> issueLightTask(@RequestBody @Validated LightTaskIssueParam param) {
        boolean result = lightTaskService.issueLightTask(param);
        if (result) {
            return ResponseUtil.success("下发成功");
        } else {
            return ResponseUtil.fail("下发失败");
        }
    }
}