Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.上送工具接口调整

Browse Source
This commit is contained in:
wr
2023-12-08 16:00:30 +08:00
parent dd12255974
commit 8acb169274
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
View File

@@ -33,7 +33,7 @@ public enum GWSendEnum {
DETAIL_CREATE("pqConverterMonitorDetailCreate", "/WMCenter/powerQuality/converterMonitor/detailCreate"), DETAIL_CREATE("pqConverterMonitorDetailCreate", "/WMCenter/powerQuality/converterMonitor/detailCreate"),
//接收电能质量变电站监测统计数据接口 //接收电能质量变电站监测统计数据接口
SUBSTATION_MONITOR("pqSubstationMonitorCreate", "/WMCenter/powerQuality/substationMonitor/create"), SUBSTATION_MONITOR("pqSubstationMonitorCreate", "/WMCenter/powerQuality/substationMonitor/create"),
//2.4.1.21接收其他干扰用户台账数据接口 //接收其他干扰用户台账数据接口
OTHER_USER_CREATE("pqArchivalInformationOtherUserCreate", "/WMCenter/powerQuality/archivalInformation/otherUserCreate"), OTHER_USER_CREATE("pqArchivalInformationOtherUserCreate", "/WMCenter/powerQuality/archivalInformation/otherUserCreate"),

11
pqs-common/common-web/src/main/java/com/njcn/web/utils/GwSendUtil.java
View File

@@ -5,6 +5,7 @@ import com.alibaba.csb.sdk.*;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.web.enums.GWSendEnum;
import com.njcn.web.pojo.param.SendParam; import com.njcn.web.pojo.param.SendParam;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@@ -27,11 +28,10 @@ public class GwSendUtil {
/** /**
* *
* @param param 上报入参数据 * @param param 上报入参数据
* @param url 上报地址 例如（http://dwzyywzt-pms3-proxy.com/CSB/WMCenter/powerQuality/plan/create） * @param sendEnum 上送接口枚举
* @param serviceName 例如（pqPlanCreate）
* @return * @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<>(); Map<String, String> map = new LinkedHashMap<>();
try { try {
ContentBody cb; ContentBody cb;
@@ -46,18 +46,17 @@ public class GwSendUtil {
//如果需要传递请求参数 可以拼接到请求URL中，或者设置paramsMap参数由SDK内部进行拼接 //如果需要传递请求参数 可以拼接到请求URL中，或者设置paramsMap参数由SDK内部进行拼接
HttpParameters.Builder builder = HttpParameters.newBuilder(); HttpParameters.Builder builder = HttpParameters.newBuilder();
builder.requestURL(url) // 设置请求的URL,可以拼接URL请求参数 builder.requestURL(sendEnum.getUrl()) // 设置请求的URL,可以拼接URL请求参数
.api("zongbuSync") // 设置服务名 .api("zongbuSync") // 设置服务名
.version("1.0.0") // 设置版本号 .version("1.0.0") // 设置版本号
.method("post") // 设置调用方式, 必须为 post .method("post") // 设置调用方式, 必须为 post
.contentType("application/json; charset=UTF-8") //设置请求content-type .contentType("application/json; charset=UTF-8") //设置请求content-type
.accessKey("7d4cb2c0afb5468ca56e0654b1a442ef").secretKey("lW2xr6zKjbaqVDOSgQpcGrM6Rg0=");// 设置accessKey 和 设置secretKey .accessKey("7d4cb2c0afb5468ca56e0654b1a442ef").secretKey("lW2xr6zKjbaqVDOSgQpcGrM6Rg0=");// 设置accessKey 和 设置secretKey
builder.contentBody(cb); builder.contentBody(cb);
String token = LoginToken(); String token = LoginToken();
builder.putHeaderParamsMap("x-token", token); builder.putHeaderParamsMap("x-token", token);
builder.putHeaderParamsMap("serviceName", serviceName); builder.putHeaderParamsMap("serviceName", sendEnum.getServiceName());
//进行调用，返回结果 //进行调用，返回结果
try { try {
HttpReturn ret = HttpCaller.invokeReturn(builder.build()); HttpReturn ret = HttpCaller.invokeReturn(builder.build());