From 3fbde4dd7e79fdb11f1fd140de0d5ada1f16d04d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 11 二月 2025 08:15:58 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/OpenController.java | 62 ++++++++++++++++++------------
1 files changed, 37 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c88d787..12294d2 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,15 +1,19 @@
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.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.zy.asrs.entity.ApiLog;
import com.zy.asrs.entity.param.CheckParam;
import com.zy.asrs.entity.param.MatSyncParam;
import com.zy.asrs.entity.param.OrderProdSyncParam;
import com.zy.asrs.entity.param.OrderSyncParam;
+import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
@@ -18,7 +22,9 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -38,6 +44,11 @@
@Autowired
private OpenService openService;
+
+
+ @Autowired
+ private ApiLogService apiLogService;
+
/**
* 搴撳瓨缁熻
@@ -69,7 +80,7 @@
private void auth(String appkey, Object obj, HttpServletRequest request) {
- log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+ //log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
request.setAttribute("cache", obj);
if (!auth) {
return;
@@ -82,26 +93,6 @@
}
}
-
- @PostMapping("/order/pak/default/v1")
- @AppAuth(memo = "鐢熸垚閫�璐цˉ璐у崟鎹�")
- public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
- @RequestBody(required = true) OrderSyncParam param,
- HttpServletRequest request) {
- log.info("鐢熸垚閫�璐цˉ璐у崟鎹�,{}", JSON.toJSONString(param));
- auth(appkey, param, request);
- if (Cools.isEmpty(param)) {
- return R.parse(BaseRes.PARAM);
- }
-
- String docName = param.get鎿嶄綔鍗曟嵁();
- boolean pakin = param.getPakin() == 1 ? true : false;
-
- openService.syncOrder(param, pakin, docName);
-
- return R.ok("鍗曟嵁鎺ュ彈鎴愬姛");
-
- }
/*
鐩樼偣鎺ュ彛
@@ -127,7 +118,7 @@
public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
@RequestBody Map<String, Object> map,
HttpServletRequest request) {
- log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
+ //log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -204,7 +195,7 @@
@AppAuth(memo = "鍚屾宸ュ崟鍗曟嵁")
public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
@RequestBody Map<String, Object> map) {
- log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(map));
+ //log.info("鍚屾宸ュ崟鍗曟嵁,{}", JSON.toJSONString(map));
OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -276,7 +267,7 @@
public synchronized R orderPakin2(@RequestHeader(required = false) String appkey,
@RequestBody Map<String, Object> map,
HttpServletRequest request) {
- log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
+ //log.info("鐢熸垚鍏ュ簱鍗曟嵁,{}", JSON.toJSONString(map));
OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
auth(appkey, param, request);
if (Cools.isEmpty(param)) {
@@ -300,7 +291,7 @@
mappingPakOutOrderParam(param, false, "閾跺骇鐢熶骇琛ユ枡鐢宠鍗�");
break;
case "閾跺骇鐢熶骇鍏ュ簱鐢宠鍗�":
- mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇鍏ュ簱鍗�");
+ mappingPakOutOrderParam(param, true, "閾跺骇鐢熶骇鍏ュ簱鐢宠鍗�");
break;
default:
log.info("鏈煡鐨勫崟鎹被鍨�:{}", param);
@@ -485,4 +476,25 @@
//return orderSyncParam;
}
+
+// @PostMapping("/order/add")
+// public R re(@RequestHeader(required = false) String appkey,
+// HttpServletRequest request) throws IOException {
+// List<ApiLog> apiLogs = apiLogService.selectList(new EntityWrapper<ApiLog>().eq("url", "/phyzwms/open/asrs/order/pakin/default/v1").eq("response", "{\"msg\":\"鏈嶅姟鍣ㄩ敊璇痋",\"code\":500}").ge("create_time", "2025-01-06 00:00:00"));
+// for (ApiLog apiLog : apiLogs) {
+// Map<String, Object> param = new HashMap<>();
+// ObjectMapper mapper = new ObjectMapper();
+// if (!Cools.isEmpty(apiLog.getRequest())) {
+// param = mapper.readValue(apiLog.getRequest(), Map.class);
+// try {
+// orderPakin(appkey, param, request);
+// } catch (Exception e) {
+//
+// }
+// }
+// }
+// return R.ok();
+//
+// }
+
}
--
Gitblit v1.9.1