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 send(SendParam param, String url, String serviceName) { + public static Map send(SendParam param, GWSendEnum sendEnum) { Map 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());