From 8bae75b786264cc0d1d95b648e403ad2c3b88c52 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 23 五月 2025 15:52:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OpenController.java | 190 ++++++-----------------------------------------
1 files changed, 25 insertions(+), 165 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b497435..a2632f0 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -3,12 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.zy.asrs.domain.enums.TaskStatusType;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.*;
@@ -16,16 +15,12 @@
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
import java.lang.reflect.Field;
import java.util.*;
-
-import static org.apache.ibatis.ognl.OgnlRuntime.setFieldValue;
@Slf4j
@RestController
@@ -53,32 +48,37 @@
@Autowired
private BasCrnErrorService basCrnErrorService;
- @Value("${wms.url}")
- private String wmsUrl;
-
private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
- //agv浠诲姟瀹屾垚
- @PostMapping("/toAgvTaskOver")
- @AppAuth(memo = "agv浠诲姟瀹屾垚鎺ュ彛")
- public R getAgvTaskOver(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
+
+ //AGV涓婃姤
+ @PostMapping("/agvReport")
+ public R agvReport(@RequestBody HashMap<String, Object> param) {
+ String taskCode = param.get("taskCode").toString();
+ System.out.println(JSON.toJSONString(param));
+
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskCode);
+ if(taskWrk == null) {
+ return R.error("浠诲姟涓嶅瓨鍦�");
}
- if (Cools.isEmpty(param.getWharfCode())){
- return R.error("鐮佸ご[wharfCode]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getStatus())){
- return R.error("瀹屾垚鏍囪[status]涓嶈兘涓虹┖");
- }
- openService.getAgvTaskOver(param);
+
+ taskWrk.setStatus(TaskStatusType.COMPLETE.id);
+ taskWrk.setModiTime(new Date());
+ taskWrkService.updateById(taskWrk);
return R.ok();
+ }
+
+ //鐢熸垚AGV浠诲姟
+ @PostMapping("/generateAgvTask")
+ public R generateAgvTask(@RequestBody GenerateAgvTaskParam param) {
+ boolean generated = openService.generateAgvTask(param);
+ if(generated) {
+ return R.ok();
+ }
+ return R.error();
}
//鍒涘缓浠诲姟
@@ -158,44 +158,6 @@
return R.ok().add(taskWrk);
}
- //鍙栨斁璐х敵璇�
- @PostMapping("/pick/and/place/v1")
- @AppAuth(memo = "agv鍙栨斁璐х敵璇�")
- public R getAgvPickAndPlaceV1(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getStaNo())){
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())){
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV1(param);
- }
-
- //鍙栨斁璐у畬鎴愬弽棣�
- @PostMapping("/pick/and/place/v2")
- @AppAuth(memo = "agv鍙栨斁璐у畬鎴愬弽棣�")
- public R getAgvPickAndPlaceV2(@RequestHeader String appkey,
- @RequestBody TaskOverParam param,
- HttpServletRequest request){
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (Cools.isEmpty(param.getStaNo())){
- return R.error("鐮佸ご[staNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getType())){
- return R.error("绫诲瀷[type]涓嶈兘涓虹┖");
- }
- return openService.getAgvPickAndPlaceV2(param);
- }
-
//鏌ヨ浠诲姟鎸囦护闆嗗悎
@GetMapping("/queryTaskCommand")
public R queryTaskCommand(@RequestHeader String appkey,
@@ -220,100 +182,6 @@
if (!APP_KEY_LIST.contains(appkey)) {
throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
}
- }
-
- //AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛
- @PostMapping("/targetWharfApply")
- @AppAuth(memo = "AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛")
- public R targetWharfApply(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
- HttpServletRequest request) throws IOException {
- auth(appkey,param,request);
-
- if (Cools.isEmpty(param)){
- return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getTaskNo())){
- return R.error("宸ヤ綔鍙蜂负绌猴紒");
- } else if (Cools.isEmpty(param.getContainerCode())){
- return R.error("鎵樼洏缂栫爜涓虹┖锛�");
- } else if (Cools.isEmpty(param.getWharfSource())){
- return R.error("婧愮爜澶翠负绌猴紒");
- } else if (Cools.isEmpty(param.getFreeWharfs()) || param.getFreeWharfs().size()==0){
- return R.error("绌洪棽鐨勫叆搴撶爜澶达紙AGV锛変负绌猴紒");
- }
- R r = openService.AgvToWCSToWms(param);
- apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
- ,request.getRemoteAddr()+request.getRequestURI()
- ,appkey
- ,request.getRemoteAddr()
- ,JSON.toJSONString(param)
- ,r.toString()
- ,true
- );
- return r;
- }
-
- //AGV璇锋眰鍔ㄤ綔鎺ュ彛
- @PostMapping("/agvTaskRequest")
- @AppAuth(memo = "AGV璇锋眰鍔ㄤ綔鎺ュ彛")
- public R agvTaskRequest(@RequestHeader String appkey,
- @RequestBody WMSAndAGVInterfaceParam param,
- HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)){
- return R.error("鍙傛暟涓虹┖锛�");
- } else if (Cools.isEmpty(param.getRequestType())){
- return R.error("璇锋眰绫诲瀷涓虹┖锛�");
- } else if (Cools.isEmpty(param.getWharfCode())){
- return R.error("鐮佸ご缂栧彿涓虹┖锛�");
- }
-
- Map<String,Integer> map = new HashMap<>();
- map.put("J-1102",102);map.put("J-1101",101);
- map.put("J-1103",105);map.put("J-1104",106);
- map.put("J-1105",109);map.put("J-1106",110);
- map.put("J-1107",113);map.put("J-1108",114);
- map.put("J-1109",117);map.put("J-1110",118);
- map.put("J-1111",121);map.put("J-1112",122);
- map.put("H-1102",300);map.put("H-1101",305);
- map.put("G-1102",400);map.put("G-1101",405);
-// StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
-// .eq("stn_desc", param.getWharfCode()));
-//
-// if (Cools.isEmpty(staDesc)){
-// return R.error("绋嬪簭鎶ラ敊锛屾湭鏌ヨ鍒扮珯鐐�");
-// }
- if (Cools.isEmpty(map.get(param.getWharfCode()))){
- return R.error("鏈煡璇㈠埌绔欑偣");
- }
- BasDevp basDevp = basDevpService.selectById(map.get(param.getWharfCode()));
-// BasDevp basDevp = basDevpService.selectById(staDesc.getStnNo());
- if (basDevp.getAutoing().equals("Y") && (basDevp.getInEnable().equals("Y") || basDevp.getOutEnable().equals("Y"))){
- apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
- ,request.getRemoteAddr()+request.getRequestURI()
- ,appkey
- ,request.getRemoteAddr()
- ,JSON.toJSONString(param)
- ,R.ok().toString()
- ,true
- );
- return R.ok("鍙叆");
- }else {
- apiLogService.save("AGV璇锋眰鍏ュ簱鐮佸ご鎺ュ彛"
- ,request.getRemoteAddr()+request.getRequestURI()
- ,appkey
- ,request.getRemoteAddr()
- ,JSON.toJSONString(param)
- ,R.error("绔欑偣鐘舵�佷笉鍙叆").toString()
- ,true
- );
- return R.error("绔欑偣鐘舵�佷笉鍙叆");
- }
-
-
-
-
-
}
//浠诲姟涓嬪彂鎺ュ彛
@@ -519,14 +387,6 @@
} else {
System.out.println("Unsupported field type: " + fieldType.getName());
}
- }
-
- //agv涓婃姤
- @PostMapping("/agvReport")
- public R agvReport(@RequestBody HashMap<String, Object> param) {
- String taskCode = param.get("taskCode").toString();
- System.out.println(JSON.toJSONString(param));
- return R.ok();
}
}
--
Gitblit v1.9.1