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 | 199 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 176 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index dd13352..4f09e0e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,20 +1,23 @@
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.param.OpenOrderCompleteParam;
-import com.zy.asrs.entity.param.OpenOrderPakinParam;
-import com.zy.asrs.entity.param.OpenOrderPakoutParam;
+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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+import java.util.*;
/**
* Created by vincent on 2022/4/8
@@ -22,7 +25,7 @@
@Slf4j
@RestController
@RequestMapping("open/asrs")
-public class OpenController {
+public class OpenController extends BaseController {
private static final boolean auth = true;
public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
@@ -31,14 +34,47 @@
@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) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ openService.syncMat(param);
+ return R.ok();
+ }
+
+ /****************************************************************************/
+ /********************************* 鎵撳寘涓婄嚎 **********************************/
+ /****************************************************************************/
+
+// @PostMapping("/order/pakin/new/package/v1")
+// @AppAuth(memo = "鎵撳寘涓婄嚎鎺ュ彛")
+// public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
+// @RequestBody(required = false) PackParam param,
+// HttpServletRequest request) {
+// auth(appkey, param, request);
+// if (Cools.isEmpty(param)) {
+// return R.parse(BaseRes.PARAM);
+// }
+// openService.packageUp(param);
+// return R.ok();
+// }
/**
* 娣诲姞鍏ュ簱鍗�
*/
- @PostMapping("/order/pakin/new/default/v1")
+ @PostMapping("/order/pakin/default/v1")
public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakinParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakinParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -60,20 +96,29 @@
*/
@PostMapping("/order/pakin/complete/default/v1")
public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakinOrderComplete(param));
}
/**
* 娣诲姞鍑哄簱鍗�
*/
- @PostMapping("/order/pakout/new/default/v1")
+ @PostMapping("/order/pakout/default/v1")
+ @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
- @RequestBody OpenOrderPakoutParam param) {
- auth(appkey, param);
+ @RequestBody OpenOrderPakoutParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
+ }
+ if (Cools.isEmpty(param.getLgort())) {
+ return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
+ }
+ if (!param.getLgort().equals("5006")) {
+ return R.ok();
}
if (Cools.isEmpty(param.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
@@ -93,8 +138,9 @@
*/
@PostMapping("/order/pakout/complete/default/v1")
public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
- @RequestBody(required = false) OpenOrderCompleteParam param) {
- auth(appkey, param);
+ @RequestBody(required = false) OpenOrderCompleteParam param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
return R.ok().add(openService.pakoutOrderComplete(param));
}
@@ -103,14 +149,15 @@
* 搴撳瓨缁熻
*/
@RequestMapping("/stock/default/v1")
- public R queryStock(@RequestHeader(required = false) String appkey) {
- auth(appkey, null);
+ public R queryStock(@RequestHeader(required = false) String appkey,
+ HttpServletRequest request) {
+ auth(appkey, null, request);
return R.ok().add(openService.queryStock());
}
-
- private void auth(String appkey, Object obj) {
- log.info("{}鎺ュ彛琚闂紒appkey:{},璇锋眰鏁版嵁锛歿}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ private void auth(String appkey, Object obj, HttpServletRequest request) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ request.setAttribute("cache", obj);
if (!auth) {
return;
}
@@ -154,11 +201,117 @@
orderDetails.add(detlDto);
}
System.out.println(JSON.toJSONString(param));
- // 2
System.out.println("======================================");
OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
param1.setOrderNo("963001846497017856");
System.out.println(JSON.toJSONString(param1));
}
+ /*...........................璧ｅ窞鏂板..............浠ヤ笅.............璧ｅ窞鏂板...........................*/
+ @PostMapping("/rpc/watchDog/auth/v1")
+ @AppAuth(memo = "蹇冭烦鎺ュ彛璋冪敤")
+ public synchronized R hostName(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) HeartBeat param,
+ HttpServletRequest request) {
+ auth(appkey, param, request);
+ if (Cools.isEmpty(param)) {
+ return R.parse(BaseRes.PARAM);
+ }
+ return R.ok();
+ }
+
+ @PostMapping("/rpc/pakIn/auth/v1")
+ @AppAuth(memo = "PACK淇℃伅涓嬪彂")
+ public synchronized R combPack(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = false) CombParam param,
+ 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();
+ }
+ @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) {
+//
+// 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")
+// @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) {
+// 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