From 757f103f37d83dfb55bb49b3df0b805cb520d4f7 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 11 十月 2025 15:28:26 +0800
Subject: [PATCH] 第三版
---
src/main/java/com/zy/asrs/controller/OpenController.java | 267 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 197 insertions(+), 70 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 475b2dc..7c84355 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,12 +1,18 @@
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.*;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TestMast;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
+import com.zy.asrs.service.impl.WrkMastServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -31,12 +37,16 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
+ @Autowired
+ private WrkMastServiceImpl wrkMastService;
@PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
@@ -196,7 +206,6 @@
orderDetails.add(detlDto);
}
System.out.println(JSON.toJSONString(param));
- // 2
System.out.println("======================================");
OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
param1.setOrderNo("963001846497017856");
@@ -208,101 +217,219 @@
@AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
public synchronized R hostName(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) HeartBeat param,
- HttpServletRequest request){
+ HttpServletRequest request) {
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
-
- //........
- System.out.println(String.format("id:%s,hostName:%s,requestTime:%s",
- param.getId(),param.getHostName(),param.getRequestTime()));
-
return R.ok();
}
@PostMapping("/rpc/pakIn/auth/v1")
- @AppAuth(memo = "鍏ュ簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+ @AppAuth(memo = "PACK淇℃伅涓嬪彂")
public synchronized R combPack(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) CombParam param,
- HttpServletRequest request){
-
- auth(appkey, param, request);
+ HttpServletRequest request) {
+ log.info("PACK淇℃伅涓嬪彂鎺ュ彛璋冪敤"+appkey+param);
+ auth("ea1f0459efc02a79f046f982767939ae", param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- //鐢熸垚鍏ュ簱閫氱煡妗�
+ //鐢熸垚鍟嗗搧妗ｆ
openService.combPACK(param);
-
- Map<String,Boolean> map=new HashMap<>();
- map.put("isComplete",true);
- return R.ok(map);
+// Map<String, Boolean> map = new HashMap<>();
+// map.put("isComplete", true);
+ return R.ok();
}
- @PostMapping("/rpc/pakOut/auth/v1")
- @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
- public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) CombParam param,
- HttpServletRequest request){
-
- auth(appkey, param, request);
+ @PostMapping("/rpc/packStatus")
+// @AppAuth(memo = "PACK淇℃伅涓嬪彂")
+ public synchronized R packStatus(@RequestBody(required = false) CombParam param) {
+ log.info("PACK淇℃伅涓嬪彂鎺ュ彛璋冪敤={}",param);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- //鍑哄簱寮�濮�
- openService.combPackOut(param);
-
- Map<String,Boolean> map=new HashMap<>();
- map.put("isComplete",true);
- return R.ok(map);
+ Integer channel = 0;
+ if(param.getGroup().equals("192.168.1.101")){
+ switch (param.getChannel()){
+ case 1: channel = 24;
+ break;
+ case 2: channel = 23;
+ break;
+ case 3: channel = 22;
+ break;
+ case 4: channel = 21;
+ break;
+ }
+ }else if(param.getGroup().equals("192.168.1.102")){
+ switch (param.getChannel()){
+ case 1: channel = 20;
+ break;
+ case 2: channel = 19;
+ break;
+ case 3: channel = 18;
+ break;
+ case 4: channel = 17;
+ break;
+ }
+ }else if(param.getGroup().equals("192.168.1.103")){
+ switch (param.getChannel()){
+ case 1: channel = 16;
+ break;
+ case 2: channel = 15;
+ break;
+ case 3: channel = 14;
+ break;
+ case 4: channel = 13;
+ break;
+ }
+ }else if(param.getGroup().equals("192.168.1.104")){
+ switch (param.getChannel()){
+ case 1: channel = 1;
+ break;
+ case 2: channel = 2;
+ break;
+ case 3: channel = 3;
+ break;
+ case 4: channel = 4;
+ break;
+ }
+ }else if(param.getGroup().equals("192.168.1.105")){
+ switch (param.getChannel()){
+ case 1: channel = 5;
+ break;
+ case 2: channel = 6;
+ break;
+ case 3: channel = 7;
+ break;
+ case 4: channel = 8;
+ break;
+ }
+ }else if(param.getGroup().equals("192.168.1.106")){
+ switch (param.getChannel()){
+ case 1: channel = 9;
+ break;
+ case 2: channel = 10;
+ break;
+ case 3: channel = 11;
+ break;
+ case 4: channel = 12;
+ break;
+ }
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+ .eq("channel", channel)
+ .eq("loc_sts","F"));
+ if (Cools.isEmpty(locMast)) {
+ return R.error("娌℃湁鎵惧埌璇ラ�氶亾----"+channel);
+ }
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
+ locMast.setPackStatus(param.getStatus());
+ locMast.setModiTime(new Date());
+ locMastService.updateById(locMast);
+ return R.ok();
}
- @PostMapping("/rpv/infoReview/auth/v1")
- @AppAuth(memo = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
- public synchronized R infoReview(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Review param,
- HttpServletRequest request){
-
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
+ /**
+ * 鑾峰彇agv鐘舵��
+ * @param param
+ * @return
+ * 0锛氬凡楠岃瘉 1锛氱瓑寰呭垎閰� 2锛氬凡鍒嗛厤 3锛氬彇璐т腑 4锛氬凡鍙�
+ * 璐� 5锛氭斁璐т腑 6锛氬凡鏀捐揣 7锛氬畬鎴� 8.浠诲姟澶辫触 9.浠诲姟鍙栨秷 10.浠诲姟寮傚父
+ * 鍙帴鍙�7.瀹屾垚鐨勪换鍔＄姸鎬�
+ * 9.浠诲姟鍙栨秷閲嶆柊鍙戦�佺Щ鍔ㄤ换鍔�
+ */
+ @PostMapping("/rbrainrobot/post_task_state")
+// @AppAuth(memo = "PACK淇℃伅涓嬪彂")
+ public synchronized R postTaskState(@RequestBody(required = false) RCSTaskStatusParam param) {
+ log.info("AGV浠诲姟鍙嶉={}",param);
+ if(Cools.isEmpty(param.getData().getTask_id())) {
+ return R.error("RCS浠诲姟鍙蜂笉鑳戒负绌�");
}
- openService.infoReview(param);
+ if(Cools.isEmpty(param.getData().getTask_state())) {
+ return R.error("RCS宸ヤ綔鐘舵�佷笉鑳戒负绌�");
+ }
+ //浠诲姟瀹屾垚鏇存柊琛ョ┖鏉垮畬鎴愪换鍔�
+ //浠诲姟瀹屾垚鏇存柊鍑哄簱瀹屾垚浠诲姟
+ if(param.getData().getTask_state()==7) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("packed", param.getData().getTask_id()));
+
+ if(Cools.isEmpty(wrkMast)) {
+ return R.ok();
+ }
+
+ if(wrkMast.getIoType()==110) {
+ wrkMast.setWrkSts(15L);//鍑哄簱浠诲姟杞巻鍙叉。
+ wrkMastService.updateById(wrkMast);
+ }else if(wrkMast.getIoType()==101) {
+ wrkMast.setWrkSts(34L);//AGV鎼繍绌烘墭鐩樺洖搴撳畬鎴�,绛夊緟绌烘澘鍏ュ簱鍚庤浆鍘嗗彶妗ｃ��
+ wrkMastService.updateById(wrkMast);
+ }
+
+ }else if (param.getData().getTask_state()==9){
+
+ }
return R.ok();
}
- @PostMapping("/rpv/testFinish/auth/v1")
- @AppAuth(memo = "娴嬭瘯瀹屾垚")
- public synchronized R testFinish(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Review param,
- HttpServletRequest request){
- auth(appkey, param, request);
- Map<String,Boolean> map=new HashMap<>();
+// @PostMapping("/rpc/pakOut/auth/v1")
+// @AppAuth(memo = "鍑哄簱閫氱煡鍗曟帴鍙ｈ皟鐢�")
+// public synchronized R combpakOut(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) CombParam param,
+// HttpServletRequest request) {
+//
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// //鍑哄簱寮�濮�
+// openService.combPackOut(param);
+//
+// Map<String, Boolean> map = new HashMap<>();
+// map.put("isComplete", true);
+// return R.ok(map);
+// }
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
- if (param.getTestResult().equals("ok")){
- map.put("isComplete",openService.testFinish(param));
- }else {
- map.put("isComplete",false);
- }
- return R.ok(map);
- }
- @PostMapping("/rpv/test/open/auth")
- @AppAuth(memo = "妯℃嫙娴嬭瘯鎺ュ彛")
- public synchronized R test1(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Object param,
- HttpServletRequest request){
+// @PostMapping("/rpv/infoReview/auth/v1")
+// @AppAuth(memo = "娴嬭瘯鏉＄爜淇℃伅澶嶆牳璇锋眰")
+// public synchronized R infoReview(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) Review param,
+// HttpServletRequest request) {
+// appkey = "ea1f0459efc02a79f046f982767939ae";
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// TestMast testMast = openService.infoReview(param);
+// if (testMast.getStatus() == 3) {
+// return R.ok();
+// } else if (testMast.getStatus() == 2) {
+// return R.error("绛夊緟鍛樺伐鎿嶄綔...");
+// }
+// return R.error();
+// }
- auth(appkey, param, request);
-
- System.out.println(param);
-
- Map<String,Boolean> map=new HashMap<>();
- map.put("isComplete",true);
- return R.ok(map);
- }
+// @PostMapping("/rpv/testFinish/auth/v1")
+// @AppAuth(memo = "娴嬭瘯瀹屾垚")
+// public synchronized R testFinish(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) Review param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// Map<String, Boolean> map = new HashMap<>();
+//
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// if (param.getTestResult().equals("OK")) {
+// map.put("isComplete", openService.testFinish(param));
+// } else if (param.getTestResult().equals("NG")) {
+// openService.testNG(param);
+// map.put("isComplete", false);
+// } else {
+// map.put("isComplete", false);
+// }
+// return R.ok(map);
+// }
/*...........................璧ｅ窞鏂板..............浠ヤ笂.............璧ｅ窞鏂板...........................*/
--
Gitblit v1.9.1