From e760b8a8ec81b7113a01b98eb2d165dcf84fc1b2 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 20 四月 2026 13:48:47 +0800
Subject: [PATCH] 对接接口开发
---
src/main/java/com/zy/asrs/controller/OpenController.java | 155 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 123 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index e9735dc..99787dc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,6 +1,7 @@
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;
@@ -12,23 +13,25 @@
import com.zy.asrs.entity.result.OpenInventoryVo;
import com.zy.asrs.entity.result.OpenSummaryVo;
import com.zy.asrs.entity.result.TokenVo;
+import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.OpenService;
+import com.zy.common.service.wms.Result;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
/**
* Created by vincent on 2022/4/8
@@ -51,6 +54,20 @@
@Autowired
private LocMastService locMastService;
+
+ @Autowired
+ private LocDetlMapper locDetlMapper;
+
+ @Value("${open-asrs.auth.app-id:wms_8f7c3d126a944e3ab5c89d21f4a7c6b2}")
+ private String openAppId;
+
+ @Value("${open-asrs.auth.app-secret:D9f3A7xP1kLm8Q2tW5zH0sY6vR4bNcE7FjK3uM9pT2aL8qX6}")
+ private String openAppSecret;
+
+ @Value("${open-asrs.auth.token-valid-minutes:30}")
+ private Integer tokenValidMinutes;
+
+ private static final Map<String, TokenVo> TOKEN_CACHE = new ConcurrentHashMap<>();
@Deprecated
@PostMapping("/grouping")
@@ -304,34 +321,83 @@
* @return
*/
@PostMapping("/getToken")
- public synchronized R getToken(@RequestBody(required = true) TokenParam param,
+ public synchronized R getToken(@RequestHeader(required = false) String appkey,
+ @RequestBody(required = true) TokenParam param,
HttpServletRequest request){
- authNew(param, param, request);
+ log.info("鑾峰彇Token:/getToken鎺ュ彛琚闂紝appkey={},璇锋眰鏁版嵁={}", appkey, JSON.toJSONString(param));
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
- TokenVo tokenVo = new TokenVo();
- String token = Cools.enToken(System.currentTimeMillis() + param.getAppId(), param.getAppSecret());
- tokenVo.setToken(token);
- tokenVo.setValidTime(30);
- return R.ok().add(tokenVo);
+
+ String appId = param.getAppId();
+ String appSecret = param.getAppSecret();
+ if (Cools.isEmpty(appId)) {
+ return R.error("鍙傛暟[appId]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(appSecret)) {
+ return R.error("鍙傛暟[appSecret]涓嶈兘涓虹┖");
+ }
+ if (Cools.isEmpty(openAppId) || Cools.isEmpty(openAppSecret)) {
+ throw new CoolException("绯荤粺鏈厤缃畂pen-asrs.auth.app-id鎴杘pen-asrs.auth.app-secret");
+ }
+ if (!openAppId.equals(appId) || !openAppId.equals(appSecret)) {
+ throw new CoolException("璁よ瘉澶辫触锛岃纭appId鎴朼ppSecret鏃犺锛�");
+ }
+
+ String token = UUID.randomUUID().toString().replace("-", "");
+ long expireAt = System.currentTimeMillis() + tokenValidMinutes * 60L * 1000L;
+ TOKEN_CACHE.put(token,new TokenVo(appId, expireAt));
+
+ Map<String, Object> result = new HashMap<>();
+ result.put("token", token);
+ result.put("expireAt", expireAt);
+ return R.ok().add(result);
}
- private void authNew(TokenParam param, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appSecret:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", param.getAppSecret(), JSON.toJSONString(obj));
+ private void authNew(String appkey,
+ Object obj,
+ HttpServletRequest request,
+ String url) {
+ log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", url, appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
}
- if (Cools.isEmpty(param.getAppId()) || Cools.isEmpty(param.getAppSecret())) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appId鍜宎ppSecret鏃犺锛�");
+ String authorization = request.getHeader("Authorization");
+ if (Cools.isEmpty(authorization)) {
+ authorization = request.getHeader("authorization");
}
- if (!param.getAppId().contains("HLWMS")){
- throw new CoolException("璁よ瘉澶辫触锛岃纭appId鏃犺锛�");
+ if (!Cools.isEmpty(authorization)) {
+ String val = authorization.trim();
+ if (val.toLowerCase().startsWith("bearer ")) {
+ int idx = val.indexOf(' ');
+ authorization = idx > -1 ? val.substring(idx + 1).trim() : "";
+ }else {
+ authorization = val;
+ }
}
- if (!APP_KEY_LIST.contains(param.getAppSecret())) {
- throw new CoolException("璁よ瘉澶辫触锛岃纭appSecret鏃犺锛�");
+ if (!Cools.isEmpty(authorization)) {
+ if (validToken(authorization)){
+ return;
+ }
+ throw new CoolException("璁よ瘉澶辫触锛岃纭Authorization鏃犺锛�");
}
+ throw new CoolException("璁よ瘉澶辫触锛岃纭Authorization鏃犺锛�");
+ }
+
+ public static boolean validToken(String authorization){
+ if (Cools.isEmpty(authorization)) {
+ return false;
+ }
+ TokenVo tokenInfo = TOKEN_CACHE.get(authorization);
+ if (tokenInfo == null) {
+ return false;
+ }
+ if (System.currentTimeMillis() > tokenInfo.getValidTime()) {
+ TOKEN_CACHE.remove(authorization);
+ return false;
+ }
+ return true;
}
/**
@@ -342,16 +408,18 @@
* @return
*/
@PostMapping("/erp/mat/sync")
- public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appkey,
+ public synchronized R syncMatInfoV2(@RequestHeader(required = false) String appKey,
@RequestBody(required = false) List<MatSyncParam.MatParam> param,
HttpServletRequest request){
- if (Cools.isEmpty(param)){
+ authNew(appKey, param, request, "鐗╂枡鍩虹淇℃伅鍚屾:/erp/mat/sync");
+ if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
MatSyncParam matSyncParam = new MatSyncParam();
List<MatSyncParam.MatParam> objects = new ArrayList<>();
objects = param;
matSyncParam.matDetails = objects;
+
openService.syncMat(matSyncParam);
return R.ok();
}
@@ -362,7 +430,10 @@
* @return
*/
@PostMapping("/erp/order/add")
- public synchronized R addOrder(@RequestBody OpenOrderParam param){
+ public synchronized R addOrder(@RequestHeader(required = false) String appKey,
+ @RequestBody OpenOrderParam param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "鍏�/鍑哄簱閫氱煡鍗曚笅鍙�:/erp/order/add");
if (Cools.isEmpty(param)) {
return R.parse(BaseRes.PARAM);
}
@@ -388,12 +459,20 @@
* @return
*/
@PostMapping("/erp/inventory/details")
- public synchronized R queryInventoryDetails(@RequestBody OpenInventoryParam param){
- if (Cools.isEmpty(param)){
- return R.parse(BaseRes.PARAM);
+ public synchronized Result inventory(@RequestHeader(required = false) String appKey,
+ @RequestBody JSONObject param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "搴撳瓨鏄庣粏鏌ヨ:/erp/inventory/details");
+ try {
+ String wareHouseId = param == null ? null : param.getString("wareHouseId");
+ String locId = param == null ? null : param.getString("locId");
+ String matNr = param == null ? null : param.getString("matNr");
+ String orderNo = param == null ? null : param.getString("orderNo");
+ String batch = param == null ? null : param.getString("batch");
+ return new Result(200, "鎿嶄綔鎴愬姛", locDetlMapper.inventory(wareHouseId, locId, matNr, orderNo, batch));
+ }catch (Exception e){
+ return new Result(500, e.getMessage(), null);
}
- OpenInventoryVo openInventoryVo = openService.queryInventoryDetails(param);
- return R.ok(openInventoryVo);
}
/**
@@ -402,11 +481,23 @@
* @return
*/
@PostMapping("/erp/inventory/summary")
- public synchronized R queryInventorySummary(@RequestBody OpenSummaryParam param){
- if (Cools.isEmpty(param)){
- return R.parse(BaseRes.PARAM);
+ public synchronized Result invSummary(@RequestHeader(required = false) String appKey,
+ @RequestBody JSONObject param,
+ HttpServletRequest request){
+ authNew(appKey, param, request, "搴撳瓨姹囨�绘煡璇�:/erp/inventory/summary");
+ try {
+ String wareHouseId = param == null ? null : param.getString("wareHouseId");
+ String matNr = param == null ? null : param.getString("matNr");
+ Collection<String> matNrs = null;
+ if (!Cools.isEmpty(matNr)){
+ matNrs = Arrays.stream(matNr.split(","))
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .collect(Collectors.toList());
+ }
+ return new Result(200, "鎿嶄綔鎴愬姛", locDetlMapper.invSummary(wareHouseId, matNrs));
+ }catch (Exception e){
+ return new Result(500, e.getMessage(), null);
}
- OpenSummaryVo openSummaryVo = openService.queryInventorySummary(param);
- return R.ok(openSummaryVo);
}
}
--
Gitblit v1.9.1