From aa33e56e37cd19b88ae8eea69c5ebc7c6da8b1d2 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期四, 05 六月 2025 17:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/glccwcs' into glccwcs
---
src/main/java/com/zy/asrs/controller/OpenController.java | 377 +++++++----------------------------------------------
1 files changed, 53 insertions(+), 324 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index cc090c7..29f9c40 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,31 +1,26 @@
package com.zy.asrs.controller;
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.zy.asrs.domain.param.ApplyInDevpDto;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.*;
+import com.zy.asrs.entity.param.CrnStatusParam;
+import com.zy.asrs.entity.param.TaskCreateParam;
+import com.zy.asrs.entity.param.WMSAndAGVInterfaceParam;
import com.zy.asrs.service.*;
-import com.zy.asrs.utils.Utils;
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.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@Slf4j
@RestController
@@ -56,75 +51,6 @@
private LocMastService locMastService;
@Autowired
private BasCrnErrorService basCrnErrorService;
- @Value("${wms.url}")
- private String wmsUrl;
-
- public static <T> List<T> convertListMapToListObject(List<HashMap<String, Object>> listMap, Class<T> clazz) throws Exception {
- List<T> list = new ArrayList<>();
-
- for (Map<String, Object> map : listMap) {
- T obj = clazz.getDeclaredConstructor().newInstance();
-
- for (Map.Entry<String, Object> entry : map.entrySet()) {
- String key = entry.getKey();
- Object value = entry.getValue();
-
- try {
- Field field = clazz.getDeclaredField(key);
- field.setAccessible(true);
- setFieldValue(obj, field, value);
- } catch (NoSuchFieldException e) {
- System.out.println("No such field: " + key + " in class " + clazz.getName());
- }
- }
-
- list.add(obj);
- }
-
- return list;
- }
-
- private static void setFieldValue(Object obj, Field field, Object value) throws IllegalAccessException {
- Class<?> fieldType = field.getType();
-
- if (fieldType.isAssignableFrom(value.getClass())) {
- field.set(obj, value);
- } else if (fieldType == int.class || fieldType == Integer.class) {
- field.set(obj, ((Number) value).intValue());
- } else if (fieldType == long.class || fieldType == Long.class) {
- field.set(obj, ((Number) value).longValue());
- } else if (fieldType == double.class || fieldType == Double.class) {
- field.set(obj, ((Number) value).doubleValue());
- } else if (fieldType == float.class || fieldType == Float.class) {
- field.set(obj, ((Number) value).floatValue());
- } else if (fieldType == boolean.class || fieldType == Boolean.class) {
- field.set(obj, (Boolean) value);
- } else if (fieldType == String.class) {
- field.set(obj, String.valueOf(value));
- } else {
- System.out.println("Unsupported field type: " + fieldType.getName());
- }
- }
-
- //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);
- }
- if (Cools.isEmpty(param.getWharfCode())) {
- return R.error("鐮佸ご[wharfCode]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getStatus())) {
- return R.error("瀹屾垚鏍囪[status]涓嶈兘涓虹┖");
- }
- openService.getAgvTaskOver(param);
- return R.ok();
- }
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
@@ -190,252 +116,6 @@
return R.ok();
}
- //鏌ヨ浠诲姟璇︽儏
- @GetMapping("/queryTask")
- public R queryTask(@RequestHeader String appkey,
- @RequestParam String taskNo,
- HttpServletRequest request) {
- auth(appkey, taskNo, request);
- TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (taskWrk == null) {
- return R.error("浠诲姟涓嶅瓨鍦�");
- }
- 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,
- @RequestParam String taskNo,
- HttpServletRequest request) {
- auth(appkey, taskNo, request);
- TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (taskWrk == null) {
- return R.error("浠诲姟涓嶅瓨鍦�");
- }
-
- List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskNo);
- return R.ok().add(commandInfos);
- }
-
- private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
- request.setAttribute("cache", obj);
- if (Cools.isEmpty(appkey)) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
- }
- 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("绔欑偣鐘舵�佷笉鍙叆");
- }
-
-
- }
-
- //浠诲姟涓嬪彂鎺ュ彛
- @PostMapping("/outboundTaskSend")
- @Transactional
- public HashMap<String, Object> outboundTaskSend(@RequestBody HashMap<String, Object> hashMap) {
- String jsonString = JSON.toJSONString(hashMap.get("TaskList"));
- List<CarryParam> params = JSONObject.parseArray(jsonString, CarryParam.class);
- HashMap<String, Object> map = new HashMap<>();
- List<WMSAndAGVInterfaceParam> params1 = new ArrayList<>();
- for (CarryParam param : params) {
- if (Cools.isEmpty(param)) {
- map.put("Code", "0");
- map.put("Msg", "鍙傛暟涓虹┖锛�");
- return map;
- } else if (Cools.isEmpty(param.getTaskNo())) {
- map.put("Code", "0");
- map.put("Msg", "浠诲姟鍙蜂负绌猴紒");
- return map;
- } else if (Cools.isEmpty(param.getStereoscopicTaskType())) {
- map.put("Code", "0");
- map.put("Msg", "浠诲姟绫诲瀷涓虹┖锛�");
- return map;
- }
- String fusion = Utils.Fusion(param.getOriginalRowNo(), param.getOriginalFloorNo(), param.getOriginalColumnNo());
- param.setStartPoint(fusion);
- LocMast locMast = locMastService.selectByLocNo(param.getStartPoint());
- if (Cools.isEmpty(locMast)) {
- map.put("Code", "0");
- map.put("Msg", "鍒濆搴撲綅鏃犳硶鎵惧埌锛�");
- return map;
- }
-
- HashMap<String, Object> r = new HashMap<>();
-
- if (param.getStereoscopicTaskType() == 2) {
- //鍑哄簱浠诲姟鍒涘缓
- StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
- .eq("type_no", 2)
- .eq("crn_no", locMast.getCrnNo())
- .eq("stn_no", param.getTerminalNo()));
- if (Cools.isEmpty(staDesc)) {
- map.put("Code", "0");
- map.put("Msg", "鍑哄簱璺姴涓嶅瓨鍦紒");
- return map;
- }
- r = openService.taskCreate(new TaskCreateParam(param, staDesc.getCrnNo()));
- if (r.get("Code").equals("0")) {
- return r;
- }
- } else if (param.getStereoscopicTaskType() == 3) {
- String fusion1 = Utils.Fusion(param.getGoalRowNo(), param.getGoalFloorNo(), param.getGoalColumnNo());
- param.setTerminalNo(fusion1);
- //绉诲簱浠诲姟鍒涘缓
- r = openService.taskCreate(new TaskCreateParam(param, locMast.getCrnNo()));
- if (r.get("Code").equals("0")) {
- return r;
- }
- }
- apiLogService.save("Wms浠诲姟涓嬪彂鎺ュ彛"
- , request.getRemoteAddr() + request.getRequestURI()
- , ""
- , request.getRemoteAddr()
- , JSON.toJSONString(param)
- , r.toString()
- , true
- );
- }
- map.put("Code", "1");
- map.put("Msg", "ok");
- return map;
- }
//浠诲姟鍙栨秷鎺ュ彛
@PostMapping("/taskCancel")
@@ -514,4 +194,53 @@
return R.ok(crnStatusParams);
}
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getServletPath(), appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
+ if (Cools.isEmpty(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ if (!APP_KEY_LIST.contains(appkey)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appkey鏃犺锛�");
+ }
+ }
+
+ //鏌ヨ浠诲姟璇︽儏
+ @GetMapping("/queryTask")
+ public R queryTask(@RequestHeader String appkey,
+ @RequestParam String taskNo,
+ HttpServletRequest request) {
+ auth(appkey, taskNo, request);
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error("浠诲姟涓嶅瓨鍦�");
+ }
+ return R.ok().add(taskWrk);
+ }
+
+ //鏌ヨ浠诲姟鎸囦护闆嗗悎
+ @GetMapping("/queryTaskCommand")
+ public R queryTaskCommand(@RequestHeader String appkey,
+ @RequestParam String taskNo,
+
+ HttpServletRequest request) {
+ auth(appkey, taskNo, request);
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (taskWrk == null) {
+ return R.error("浠诲姟涓嶅瓨鍦�");
+ }
+
+ List<CommandInfo> commandInfos = commandInfoService.selectByTaskNo(taskNo);
+ return R.ok().add(commandInfos);
+ }
+
+ // 澶栫疆杈撻�佺嚎wms閫氱煡杈撻�佺嚎娴佸姩,涓婃姤鏃跺�欎笂鎶ョ珯鐐瑰嵆鍙�
+ @PostMapping("/applyInDevp")
+ public R applyInDevp(@RequestHeader String appkey,
+ @RequestBody ApplyInDevpDto param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ return openService.applyInDevp(param);
+ }
+
}
--
Gitblit v1.9.1