From 3b010a80cfec8da203dfca3d0c5f0f11ef5957b3 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 27 九月 2024 16:33:22 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java | 25 ++++++++++++++++++------- 1 files changed, 18 insertions(+), 7 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java index ef818dd..b8be782 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java @@ -1,10 +1,10 @@ package com.zy.acs.manager.manager.controller; +import com.zy.acs.framework.common.Cools; import com.zy.acs.framework.common.R; -import com.zy.acs.manager.common.domain.BaseParam; -import com.zy.acs.manager.common.domain.PageParam; -import com.zy.acs.manager.manager.entity.Route; +import com.zy.acs.manager.core.domain.TaskPosDto; import com.zy.acs.manager.manager.service.MissionService; +import com.zy.acs.manager.manager.service.SegmentService; import com.zy.acs.manager.system.controller.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.List; import java.util.Map; /** @@ -23,15 +25,24 @@ public class MissionController extends BaseController { @Autowired - private MissionService missionService; + private MissionService missionService; + @Autowired + private SegmentService segmentService; @PreAuthorize("hasAuthority('manager:mission:list')") @PostMapping("/mission/page") public R page(@RequestBody Map<String, Object> map) { - BaseParam baseParam = buildParam(map, BaseParam.class); - PageParam<Route, BaseParam> pageParam = new PageParam<>(baseParam, Route.class); + return R.ok().add(Cools.add("total", Integer.MAX_VALUE).add("records", missionService.getList())); + } - return R.ok().add(null); + @PreAuthorize("hasAuthority('manager:mission:list')") + @PostMapping("/mission/posType/list") + public R posTypeList() { + List<String> list = new ArrayList<>(); + for (TaskPosDto.PosType value : TaskPosDto.PosType.values()) { + list.add(value.toString()); + } + return R.ok().add(list); } } -- Gitblit v1.9.1