From e920cc2215d036bd43ed87620ff65d25b9827625 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 03 九月 2025 17:11:52 +0800
Subject: [PATCH] 许可证有效期”改成“仓储系统许可有效期
---
src/main/java/com/zy/asrs/controller/OpenController.java | 159 +++++++++++++++++++++++++++++------------------------
1 files changed, 87 insertions(+), 72 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 982bd8d..4f09e0e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,12 +1,15 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+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.param.*;
import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
@@ -31,12 +34,14 @@
@Autowired
private OpenService openService;
+ @Autowired
+ private LocMastServiceImpl locMastService;
@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 +201,6 @@
orderDetails.add(detlDto);
}
System.out.println(JSON.toJSONString(param));
- // 2
System.out.println("======================================");
OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
param1.setOrderNo("963001846497017856");
@@ -205,97 +209,108 @@
/*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
@PostMapping("/rpc/watchDog/auth/v1")
-// @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
+ @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
public synchronized R hostName(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) HeartBeat param,
- HttpServletRequest request){
- appkey="ea1f0459efc02a79f046f982767939ae";
+ 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")
+ @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);
+ }
+ LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel", param.getChannel()));
+ if (Cools.isEmpty(locMast)) {
+ return R.error("娌℃湁鎵惧埌璇ラ�氶亾----"+param.getChannel());
+ }
+// 浜у搧鐘舵�亄0:鏃�,1:寰呮祴,2:娴嬭瘯涓�;3.娴嬭瘯瀹屾垚;4.娴嬭瘯澶辫触;5.闈欑疆涓�;6:闈欑疆瀹屾垚;7:鏆傚仠娴嬭瘯;8:绱ф�ュ嚭搴�;}
+ locMast.setPackStatus(param.getPackSts());
+ locMast.setModiTime(new Date());
+ 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){
+// 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);
+// }
- 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);
- }
-
- @PostMapping("/rpv/infoReview/auth/v1")
+// @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();
- }
- @PostMapping("/rpv/testFinish/auth/v1")
-// @AppAuth(memo = "娴嬭瘯瀹屾垚")
- public synchronized R testFinish(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) Review param,
- HttpServletRequest request){
- appkey="ea1f0459efc02a79f046f982767939ae";
- auth(appkey, param, request);
- Map<String,Boolean> map=new HashMap<>();
+// 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();
+// }
- 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);
- }
+// @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