From 6a791ac32753f05d41ff05525b89c42688fb1507 Mon Sep 17 00:00:00 2001
From: xuliangwei <xuliangwei@et.com>
Date: Tue, 18 Jul 2023 09:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E8=B0=83=E6=8E=A5=E5=8F=A3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/erp/enums/RequestRecordEnum.java   | 8 ++++----
 .../dxhy/erp/service/impl/RequestRecordServiceImpl.java   | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java
index 1a4e4eaf..522a147d 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/enums/RequestRecordEnum.java
@@ -8,9 +8,9 @@ import java.util.Map;
 
 public enum RequestRecordEnum {
 
-    SYNC_INVOICE_INFO("/sn/syncInvoiceInfo", "syncInvoiceInfo", Map.class, ResponseEntity.class,"SDNYMainProcessController"),
+    SYNC_INVOICE_INFO("/sn/syncInvoiceInfo", "syncInvoiceInfo", ResponseEntity.class,"SDNYMainProcessController", Map.class),
 
-    SINGLE_INVOICE_CHECK("/sn/singleInvoiceCheck", "singleInvoiceCheck", SNRequestObject.class, ResponseEntity.class, "SDNYMainProcessController"),
+    SINGLE_INVOICE_CHECK("/sn/singleInvoiceCheck", "singleInvoiceCheck", ResponseEntity.class, "SDNYMainProcessController", SNRequestObject.class),
 
     SINGLE_CHECK_INVOICE("singleCheckInvoice", JSONObject.class, "SNPushCheckRecordService", Map.class, String.class),
 
@@ -24,11 +24,11 @@ public enum RequestRecordEnum {
     private Class<?> responseEntityClass;
 
 
-    RequestRecordEnum(String portName, String methodName, Class<?> argClass, Class<?> responseEntityClass, String className) {
+    RequestRecordEnum(String portName, String methodName, Class<?> responseEntityClass, String className, Class<?>... argClass) {
         this.className = className;
         this.portName = portName;
         this.methodName = methodName;
-        this.argClass[0] = argClass;
+        this.argClass = argClass;
         this.responseEntityClass = responseEntityClass;
     }
 
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java
index e783ea3c..5330ea3a 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/RequestRecordServiceImpl.java
@@ -121,11 +121,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl<RequestRecordDao
         DynamicContextHolder.push(dbname+DbConstant.BUSINESS_READ);
         RequestRecord dbRecord = requestRecordDao.selectById(requestRecord.getId());
         log.info("数据库匹配信息:{}", JSONObject.toJSONString(dbRecord));
-        if (dbRecord != null && !dbRecord.getRequestDetail().equals(requestRecord.getRequestDetail())
-                && !dbRecord.getResponseDetail().equals(requestRecord.getResponseDetail())
-                && !dbRecord.getMethodName().equals(requestRecord.getMethodName())
-                && dbRecord.getStatus().equals(requestRecord.getStatus())
-                && dbRecord.getStatus() != 0) {
+        if (dbRecord == null || dbRecord.getStatus() != 0) {
             return ResponseEntity.ok(JSONObject.toJSONString(R.error("请求信息错误，请确认后再发送！")));
         }
         if (dbRecord.getIsRecall() == 0) {
@@ -136,7 +132,7 @@ public class RequestRecordServiceImpl extends MpBaseServiceImpl<RequestRecordDao
         log.info("获取到的枚举类型:{}",JSONObject.toJSONString(RequestRecordEnums));
         for (RequestRecordEnum recordenum : RequestRecordEnums) {
             if (recordenum.getMethodName().equals(dbRecord.getActiveCall())) {
-                snPushCheckRecordService = (SNPushCheckRecordService)applicationContext.getBean(recordenum.getClassName());
+                snPushCheckRecordService = JSONObject.parseObject(JSONObject.toJSONString(applicationContext.getBean(recordenum.getClassName())),SNPushCheckRecordService.class);
                 log.info("通过反射获取到的snPushCheckRecordService是否为空:{}",JSONObject.toJSONString(snPushCheckRecordService == null));
                 Method method = ReflectUtil.getMethodByName(snPushCheckRecordService.getClass(),recordenum.getMethodName());
                 log.info("通过反射获取到的方法是否为空：{}",JSONObject.toJSONString(method == null));