zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java
@@ -1,10 +1,8 @@ package com.zy.acs.manager.manager.controller; 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.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; @@ -23,15 +21,14 @@ 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(null); return R.ok().add(missionService.getList()); } } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
@@ -7,4 +7,7 @@ */ @Data public class MissionVo { String groupNo; } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java
@@ -3,6 +3,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zy.acs.manager.manager.entity.Segment; import java.util.List; public interface SegmentMapper extends BaseMapper<Segment> { List<String> getGroupNo(String state); } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java
@@ -1,4 +1,11 @@ package com.zy.acs.manager.manager.service; import com.zy.acs.manager.manager.controller.result.MissionVo; import java.util.List; public interface MissionService { List<MissionVo> getList(); } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.zy.acs.manager.manager.entity.Segment; import com.zy.acs.manager.manager.enums.SegmentStateType; import java.util.List; @@ -15,4 +16,6 @@ List<Segment> getByAgvAndState(Long agvId, String state); List<String> getGroupNo(SegmentStateType state); } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
@@ -1,11 +1,36 @@ package com.zy.acs.manager.manager.service.impl; import com.zy.acs.manager.manager.controller.result.MissionVo; import com.zy.acs.manager.manager.enums.SegmentStateType; import com.zy.acs.manager.manager.service.MissionService; import com.zy.acs.manager.manager.service.SegmentService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; /** * Created by vincent on 9/27/2024 */ @Service("missionService") public class MissionServiceImpl implements MissionService { @Autowired private SegmentService segmentService; @Override public List<MissionVo> getList() { List<MissionVo> result = new ArrayList<>(); List<String> runningGroupNos = segmentService.getGroupNo(SegmentStateType.RUNNING); for (String groupNo : runningGroupNos) { MissionVo vo = new MissionVo(); vo.setGroupNo(groupNo); } return result; } } zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
@@ -60,4 +60,9 @@ ); } @Override public List<String> getGroupNo(SegmentStateType state) { return this.baseMapper.getGroupNo(state.toString()); } } zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
@@ -23,4 +23,13 @@ </where> </sql> <select id="getGroupNo" resultType="java.lang.String"> SELECT group_id FROM man_segment WHERE state = #{state} GROUP BY group_id ORDER BY create_time DESC </select> </mapper>
