From e590b02a84d728251727a6b982de706bf051990e Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 29 七月 2023 13:08:04 +0800
Subject: [PATCH] Map适配较多库位
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 91 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index ad0cdbd..b23a41c 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -12,7 +12,9 @@
import com.zy.asrs.service.AgvWrkMastService;
import com.zy.asrs.service.ApiLogService;
import com.zy.common.utils.HttpHandler;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.io.IOException;
@@ -23,11 +25,17 @@
import java.util.stream.Collectors;
@Service
+@Slf4j
public class AgvWrkMastServiceImp extends ServiceImpl<AgvWrkMastMapper, AgvWrkMast> implements AgvWrkMastService {
+ @Value("${agv.url}")
private String url;
- private String path;
+ @Value("${agv.taskCreatePath}")
+ private String taskCreatePath;
+
+ @Value("${agv.containerMoveInPath}")
+ private String containerMoveInPath;
@Autowired
AgvWrkMastMapper agvWrkMastMapper;
@@ -36,8 +44,17 @@
public void updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
AgvWrkMast agvWrkMast = this.selectById(wrkNo);
+ //鍒ゆ柇瑕佷慨鏀圭殑宸ヤ綔妗ｇ姸鎬佹槸鍚﹀悎鐞嗭紝濡傛灉涓嶅悎鐞嗗垯鎶涘嚭寮傚父
+ checkWrkSts(agvWrkMast,wrkSts);
agvWrkMast.setWrkSts(wrkSts);
this.updateById(agvWrkMast);
+ }
+
+ private boolean checkWrkSts(AgvWrkMast agvWrkMast,long wrkSts){
+
+ // 鍒ゆ柇瑙勫垯TODO
+
+ return true;
}
public Map<String,List<Map<String,String>>> startWrk(List<AgvWrkMast> agvWrkMastList) throws IOException {
@@ -50,6 +67,20 @@
List<Map<String,String>> positionCodeMapList = new ArrayList<>();
containerMoveParam.put("containerMoveIns",positionCodeMapList);
+ getRequestParam(agvTaskCreateParam,agvWrkMastList,positionCodeMapList);
+
+ doHttpRequest(agvTaskCreateParam,"涓婃灦浠诲姟涓嬪彂",url, taskCreatePath,null,"127.0.0.1");
+
+ return containerMoveParam;
+ }
+
+ public int containerMove(Map<String, List<Map<String, String>>> containerMoveParam) throws IOException {
+
+ return doHttpRequest(containerMoveParam,"瀹瑰櫒鍏ュ満浠诲姟涓嬪彂",url, containerMoveInPath,null,"127.0.0.1");
+
+ }
+
+ private void getRequestParam(AgvTaskCreateParam agvTaskCreateParam,List<AgvWrkMast> agvWrkMastList,List<Map<String,String>> positionCodeMapList){
List<AgvTaskParam> agvTaskParamList = agvWrkMastList.stream().map(agvWrkMast -> {
AgvTaskParam agvTaskParam = new AgvTaskParam();
AgvTaskkDescribeParam agvTaskkDescribeParam = new AgvTaskkDescribeParam();
@@ -71,50 +102,42 @@
}).collect(Collectors.toList());
agvTaskCreateParam.setTasks(agvTaskParamList);
+ }
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip){
String response = "";
+ boolean success = false;
try {
response = new HttpHandler.Builder()
- .setUri("localhost:8080")
- .setPath("test/task/create")
- .setJson(JSONObject.toJSONString(agvTaskCreateParam))
+ .setUri(url)
+ .setPath(path)
+ .setJson(JSONObject.toJSONString(requestParam))
.build()
.doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+
+ int code = (int) jsonObject.get("code");
+ if(code != 0){
+ throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
+ }
+ success = true;
+ return code;
}catch (Exception e){
-
+ log.error(e.getMessage());
+ throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
}finally {
-// apiLogService.save(
-// "涓婃灦浠诲姟涓嬪彂",
-// url + path,
-// null,
-// "127.0.0.1",
-// JSON.toJSONString(requestMap),
-// response,
-// success
-// );
+ apiLogService.save(
+ namespace,
+ url + path,
+ appkey,
+ ip,
+ JSON.toJSONString(JSONObject.toJSONString(requestParam)),
+ response,
+ success
+ );
}
- JSONObject jsonObject = JSON.parseObject(response);
- //save log api
- int code = (int) jsonObject.get("code");
- if(code != 0){
- throw new CoolException("璋冪敤AGV鎺ュ彛澶辫触");
- }
-
- return containerMoveParam;
- }
-
- public int containerMove(Map<String, List<Map<String, String>>> containerMoveParam) throws IOException {
- String response = new HttpHandler.Builder()
- .setUri("localhost:8080")
- .setPath("test/container/moveIn")
- .setJson(JSONObject.toJSONString(containerMoveParam))
- .build()
- .doPost();
-
- JSONObject jsonObject = JSON.parseObject(response);
- return (int) jsonObject.get("code");
}
}
--
Gitblit v1.9.1