From 01335bc9e5c23b97bc84537e54b3ecacc4545b64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 27 九月 2024 09:57:22 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java | 13 ++----
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java | 7 +++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java | 3 +
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java | 4 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java | 5 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java | 3 +
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 25 ++++++++++++
zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml | 9 ++++
8 files changed, 61 insertions(+), 8 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..6174aed 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,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());
}
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
index c45565e..69b6e71 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java
+++ b/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;
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java
index 9f4ab4e..429948e 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/mapper/SegmentMapper.java
+++ b/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);
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java
index 3c6061c..2599c31 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java
+++ b/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();
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
index 051c0f1..2ac3a9c 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/SegmentService.java
+++ b/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);
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
index ff50244..42aea05 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
+++ b/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;
+ }
+
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
index 9caf5ea..eadf727 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/SegmentServiceImpl.java
+++ b/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());
+ }
+
}
diff --git a/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml b/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
index 70af1f3..b1d1e48 100644
--- a/zy-acs-manager/src/main/resources/mapper/manager/SegmentMapper.xml
+++ b/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>
--
Gitblit v1.9.1