From 344a6d6c8c0f27f883615eb01d99ecc019aa7b25 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期一, 17 七月 2023 09:28:55 +0800
Subject: [PATCH] 完善AGV相关接口功能
---
src/main/java/com/zy/asrs/controller/AgvWrkMastController.java | 190 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 183 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
index 2746f4e..8726947 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWrkMastController.java
@@ -1,23 +1,44 @@
package com.zy.asrs.controller;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.AgvWrkMast;
+import com.zy.asrs.entity.param.AgvTaskCreateParam;
+import com.zy.asrs.entity.param.AgvTaskParam;
+import com.zy.asrs.entity.param.AgvTaskkDescribeParam;
import com.zy.asrs.service.AgvWrkMastService;
+import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import java.util.Map;
+import java.io.IOException;
+import java.util.*;
+import java.util.stream.Collectors;
@RestController
+@RequestMapping("/agv")
public class AgvWrkMastController extends BaseController {
@Autowired
AgvWrkMastService agvWrkMastService;
- @RequestMapping("/agvWrkMast/list/auth")
+ @RequestMapping(value = "/wrkMast/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(agvWrkMastService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/wrkMast/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -25,10 +46,165 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
-
excludeTrash(param);
+ EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ allLike(AgvWrkMast.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){
+ if (orderByField.endsWith("$")){
+ orderByField = orderByField.substring(0, orderByField.length()-1);
+ }
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ }else {
+ wrapper.orderBy("io_time", false);
+ }
+ return R.ok(agvWrkMastService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.eq(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/wrkMast/add/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｆ坊鍔�")
+ public R add(AgvWrkMast wrkMast) {
+ wrkMast.setModiUser(getUserId());
+ wrkMast.setModiTime(new Date());
+ wrkMast.setAppeUser(getUserId());
+ wrkMast.setAppeTime(new Date());
+ agvWrkMastService.insert(wrkMast);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMast/delete/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ垹闄�")
+ public R delete(@RequestParam String param){
+ List<AgvWrkMast> list = JSONArray.parseArray(param, AgvWrkMast.class);
+ if (Cools.isEmpty(list)){
+ return R.error();
+ }
+ for (AgvWrkMast entity : list){
+ agvWrkMastService.delete(new EntityWrapper<>(entity));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMast/export/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍑�")
+ public R export(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
+ Map<String, Object> map = excludeTrash(param.getJSONObject("wrkMast"));
+ convert(map, wrapper);
+ List<AgvWrkMast> list = agvWrkMastService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/wrkMastQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<AgvWrkMast> wrapper = new EntityWrapper<>();
+ wrapper.like("wrk_no", condition);
+ Page<AgvWrkMast> page = agvWrkMastService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (AgvWrkMast wrkMast : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", wrkMast.getWrkNo());
+ map.put("value", wrkMast.getWrkNo());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/wrkMast/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<AgvWrkMast> wrapper = new EntityWrapper<AgvWrkMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != agvWrkMastService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(AgvWrkMast.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMast/add/pri/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ鍔犱紭鍏堢骇")
+ public R addPri(@RequestBody List<AgvWrkMast> list) {
+ if (list.isEmpty()) {
+ return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+ }
+ for (AgvWrkMast entity : list){
+ entity.setIoPri(entity.getIoPri() + 1);
+ }
+ agvWrkMastService.updateBatchById(list);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMast/red/pri/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｉ檷浣庝紭鍏堢骇")
+ public R redPri(@RequestBody List<AgvWrkMast> list) {
+ if (list.isEmpty()) {
+ return R.error("璇疯嚦灏戦�夋嫨涓�琛屾暟鎹�");
+ }
+ for (AgvWrkMast entity : list){
+ entity.setIoPri(entity.getIoPri() - 1);
+ }
+ agvWrkMastService.updateBatchById(list);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/wrkMast/startWrk/auth")
+ @ManagerAuth(memo = "宸ヤ綔妗ｅ紑濮嬩换鍔�")
+ public R startWrk(@RequestParam String param) throws IOException {
+ List<AgvWrkMast> agvWrkMastList = JSONArray.parseArray(param, AgvWrkMast.class);
+ if (Cools.isEmpty(agvWrkMastList)){
+ return R.error();
+ }
+
+ AgvTaskCreateParam agvTaskCreateParam = new AgvTaskCreateParam();
+ agvTaskCreateParam.setTaskType("putaway");
+
+ List<AgvTaskParam> agvTaskParamList = agvWrkMastList.stream().map(agvWrkMast -> {
+ AgvTaskParam agvTaskParam = new AgvTaskParam();
+ AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
+ agvTaskParam.setTaskDescribe(agvTaskkDescribeParam);
+ //AgvTaskParam
+ agvTaskParam.setTaskCode(agvWrkMast.getWrkNo().toString());
+ agvTaskParam.setTaskPriority(agvWrkMast.getIoPri().intValue());
+ //AgvTaskkDescribeParam
+ agvTaskkDescribeParam.setFromLocationCode(agvWrkMast.getSourceLocNo());
+ agvTaskkDescribeParam.setToLocationCode(agvWrkMast.getLocNo());
+ agvTaskkDescribeParam.setContainerCode(agvWrkMast.getBarcode());
+ return agvTaskParam;
+ }).collect(Collectors.toList());
+
+ agvTaskCreateParam.setTasks(agvTaskParamList);
+
+ String response = new HttpHandler.Builder()
+ .setUri("localhost:8080")
+ .setPath("test/task/create")
+ .setJson(JSONObject.toJSONString(agvTaskCreateParam))
+ .build()
+ .doPost();
+
+ JSONObject jsonObject = JSON.parseObject(response);
+ int code = (int) jsonObject.get("code");
+
+ System.out.println(response);
+
+ if(code == 0){
+
+ }
- return null;
+ return R.ok();
}
}
--
Gitblit v1.9.1