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 | 336 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 314 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e3b17dc..a2632f0 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,24 +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.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.CommandInfo;
-import com.zy.asrs.entity.TaskWrk;
-import com.zy.asrs.entity.param.taskCreateParam;
-import com.zy.asrs.service.CommandInfoService;
-import com.zy.asrs.service.OpenService;
-import com.zy.asrs.service.TaskWrkService;
+import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.*;
+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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.List;
+import java.lang.reflect.Field;
+import java.util.*;
@Slf4j
@RestController
@@ -31,30 +33,115 @@
private TaskWrkService taskWrkService;
@Autowired
private CommandInfoService commandInfoService;
+ @Autowired
+ private TaskWrkController taskWrkController;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private ApiLogService apiLogService;
+ @Autowired
+ private BasCrnpService basCrnpService;
+ @Autowired
+ private StaDescService staDescService;
+ @Autowired
+ private LocMastService locMastService;
+ @Autowired
+ private BasCrnErrorService basCrnErrorService;
+
+ private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
add("ea1f0459efc02a79f046f982767939ae");
}};
+ //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("浠诲姟涓嶅瓨鍦�");
+ }
+
+ 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();
+ }
+
//鍒涘缓浠诲姟
@PostMapping("/taskCreate")
+ @Transactional
public R taskCreate(@RequestHeader String appkey,
- @RequestBody taskCreateParam param,
+ @RequestBody List<TaskCreateParam> param1,
HttpServletRequest request) {
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
+ auth(appkey, param1, request);
+ try{
+ List<TaskCreateParam> paramList = new ArrayList<>();
+ List<String> locNoList = new ArrayList<>();
+ for (TaskCreateParam param : param1) {
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getTaskNo())) {
+ return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getIoType())) {
+ return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(param.getBarcode())) {
+ return R.error("鏉$爜[barcode]涓嶈兘涓虹┖");
+ }
+ String locNo=null;
+ if(param.getIoType()==1){
+ locNo=param.getTargetPoint();
+ }else{
+ locNo=param.getStartPoint();
+ }
+ try{
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_no", locNo).ne("loc_sts","X"));
+ if (Cools.isEmpty(locMast)){
+ log.error("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+ return R.error("搴撲綅鍙蜂笉瀛樺湪"+locNo).add("搴撲綅鍙蜂笉瀛樺湪"+locNo);
+ }
+ }catch (Exception e){
+ log.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+ return R.error("搴撲綅鍙锋娴嬬▼搴忓紓甯�").add("搴撲綅鍙锋娴嬬▼搴忓紓甯�==銆嬪紓甯镐俊鎭�"+e);
+ }
+ LocMast locMast=locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("loc_sts","F")
+ .eq("loc_no",locNo)
+ .eq("barcode",param.getBarcode()));
+ if(Cools.isEmpty(locMast)){
+ return R.error("璇ュ簱浣嶄笉婊¤冻鍑哄簱鏉′欢"+param.getTargetPoint());
+ }
+ if (!locNoList.contains(locMast.getLocNo())){
+ locNoList.add(locMast.getLocNo());
+ paramList.add(param);
+ }else {
+ return R.error("璇ュ簱浣嶄笉鑳藉悓鏃朵笅鍙戜袱绗斾换鍔�"+locMast.getLocNo());
+ }
+ }
+ for (TaskCreateParam param : paramList){
+ openService.taskCreate(param);
+ }
+ }catch (Exception e){
+ log.error("浠诲姟涓嬪彂寮傚父"+e);
+ return R.error();
}
- if (Cools.isEmpty(param.getTaskNo())) {
- return R.error("浠诲姟鍙穂taskNo]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getIoType())) {
- return R.error("浠诲姟绫诲瀷[ioType]涓嶈兘涓虹┖");
- }
- if (Cools.isEmpty(param.getBarcode())) {
- return R.error("鏉$爜[barcode]涓嶈兘涓虹┖");
- }
- openService.taskCreate(param);
return R.ok();
}
@@ -97,4 +184,209 @@
}
}
+ //浠诲姟涓嬪彂鎺ュ彛
+ @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")
+ public R taskCancel(@RequestHeader String appkey,
+ @RequestBody WMSAndAGVInterfaceParam param,
+ HttpServletRequest request) {
+ 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.getIoType())){
+ return R.error("鎿嶄綔绫诲瀷涓虹┖锛�");
+ } else if (Cools.isEmpty(param.getBarcode())){
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒");
+ }
+
+ TaskWrk taskWrk = taskWrkService.selectOne(new EntityWrapper<TaskWrk>()
+ .eq("task_no", param.getTaskNo())
+ .eq("io_type",param.getIoType())
+ .eq("barcode",param.getBarcode()));
+ if (Cools.isEmpty(taskWrk)){
+ return R.error("鏈煡鍒板綋鍓嶄换鍔�---"+param);
+ }
+ boolean sign =false;
+ switch (param.getTaskStatus()){
+ case 1://姝e父鍙栨秷
+ if (taskWrk.getStatus()>1){
+ return R.error("浠诲姟宸插紑濮嬫墽琛�");
+ }
+ break;
+ case 2://姝e父瀹屾垚
+ if (taskWrk.getStatus()>1){
+ return R.error("浠诲姟宸插紑濮嬫墽琛�");
+ }
+ sign=true;
+ break;
+ default:
+ return R.error("鏈煡鎿嶄綔");
+ }
+ return taskWrkOperate(taskWrk,sign);
+ }
+
+ //浠诲姟鎿嶄綔
+ private R taskWrkOperate(TaskWrk taskWrk,boolean sign){
+ try{
+ if (sign){//瀹屾垚
+ return taskWrkController.complete(taskWrk.getTaskNo());
+ }else {//鍙栨秷
+ return taskWrkController.cancel(taskWrk.getTaskNo());
+ }
+ }catch (Exception e){
+ return R.error();
+ }
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @GetMapping("/deviceStatus")
+ @Transactional
+ public R deviceStatus() {
+ List<CrnStatusParam> crnStatusParams=new ArrayList<>();
+ List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
+ for (BasCrnp basCrnp:basCrnps){
+ CrnStatusParam crnStatusParam=new CrnStatusParam();
+ crnStatusParam.setCrnNo(basCrnp.getCrnNo());
+ crnStatusParam.setCrnSts(basCrnp.getCrnSts());
+ crnStatusParam.setErrorCode(basCrnp.getCrnErr());
+ BasCrnError error=basCrnErrorService.selectOne(new EntityWrapper<BasCrnError>().eq("error_code",basCrnp.getCrnErr()));
+ if(Cools.isEmpty(error)){
+ crnStatusParam.setErrorMsg("");
+ }else {
+ crnStatusParam.setErrorMsg(error.getErrName());
+ }
+ crnStatusParams.add(crnStatusParam);
+ }
+ return R.ok(crnStatusParams);
+ }
+
+ //璁惧鐘舵�佹煡璇㈡帴鍙�
+ @PostMapping("/devpdeviceStatus")
+ @Transactional
+ public String devpDeviceStatus(@RequestBody HashMap staNo) {
+ BasDevp basDevp=basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no",staNo.get("staNo")));
+ if(basDevp==null||basDevp.getLoading().equals("Y")||basDevp.getOutEnable().equals("N")){
+ return "no";
+ }
+ return "ok";
+ }
+
+ 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());
+ }
+ }
+
}
--
Gitblit v1.9.1