From 8acb169274fe2ace80f4253bd424c4fbfd84e845 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Fri, 8 Dec 2023 16:00:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=B8=8A=E9=80=81=E5=B7=A5=E5=85=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/web/enums/GWSendEnum.java  |  2 +-
 .../src/main/java/com/njcn/web/utils/GwSendUtil.java  | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
index a538413d2..13cb87e8a 100644
--- a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
+++ b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
@@ -33,7 +33,7 @@ public enum GWSendEnum {
     DETAIL_CREATE("pqConverterMonitorDetailCreate", "/WMCenter/powerQuality/converterMonitor/detailCreate"),
     //接收电能质量变电站监测统计数据接口
     SUBSTATION_MONITOR("pqSubstationMonitorCreate", "/WMCenter/powerQuality/substationMonitor/create"),
-    //2.4.1.21接收其他干扰用户台账数据接口
+    //接收其他干扰用户台账数据接口
     OTHER_USER_CREATE("pqArchivalInformationOtherUserCreate", "/WMCenter/powerQuality/archivalInformation/otherUserCreate"),
 
 
diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java b/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java
index 85552636e..e00e70220 100644
--- a/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java
+++ b/pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java
@@ -5,6 +5,7 @@ import com.alibaba.csb.sdk.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.web.enums.GWSendEnum;
 import com.njcn.web.pojo.param.SendParam;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
@@ -27,11 +28,10 @@ public class GwSendUtil {
     /**
      *
      * @param param 上报入参数据
-     * @param url   上报地址 例如（http://dwzyywzt-pms3-proxy.com/CSB/WMCenter/powerQuality/plan/create）
-     * @param serviceName   例如（pqPlanCreate）
+     * @param sendEnum 上送接口枚举
      * @return
      */
-    public static Map<String, String> send(SendParam param, String url, String serviceName) {
+    public static Map<String, String> send(SendParam param, GWSendEnum sendEnum) {
         Map<String, String> map = new LinkedHashMap<>();
         try {
             ContentBody cb;
@@ -46,18 +46,17 @@ public class GwSendUtil {
             //如果需要传递请求参数 可以拼接到请求URL中，或者设置paramsMap参数由SDK内部进行拼接
             HttpParameters.Builder builder = HttpParameters.newBuilder();
 
-            builder.requestURL(url) // 设置请求的URL,可以拼接URL请求参数
+            builder.requestURL(sendEnum.getUrl()) // 设置请求的URL,可以拼接URL请求参数
                     .api("zongbuSync") // 设置服务名
                     .version("1.0.0") // 设置版本号
                     .method("post") // 设置调用方式, 必须为 post
                     .contentType("application/json; charset=UTF-8") //设置请求content-type
                     .accessKey("7d4cb2c0afb5468ca56e0654b1a442ef").secretKey("lW2xr6zKjbaqVDOSgQpcGrM6Rg0=");// 设置accessKey 和 设置secretKey
 
-
             builder.contentBody(cb);
             String token = LoginToken();
             builder.putHeaderParamsMap("x-token", token);
-            builder.putHeaderParamsMap("serviceName", serviceName);
+            builder.putHeaderParamsMap("serviceName", sendEnum.getServiceName());
             //进行调用，返回结果
             try {
                 HttpReturn ret = HttpCaller.invokeReturn(builder.build());