From 7b817c0418cca12a7cb8852b63c135d9e1b9a20f Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 05 八月 2023 15:58:06 +0800
Subject: [PATCH] 武汉军粮省平台-提交数据推送封装
---
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 48 +++-
src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java | 7
src/main/java/com/fzzy/api/service/ApiRemoteService.java | 2
src/main/java/com/fzzy/push/whhpjl/dto/WhjlReqDto.java | 64 +++++++
src/main/java/com/fzzy/push/whhpjl/Whjl2023HttpClientUtil.java | 95 ----------
src/main/java/com/fzzy/whjl/WhjlConstant.java | 236 ++++++++-----------------
src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java | 23 +-
src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java | 48 +++++
8 files changed, 249 insertions(+), 274 deletions(-)
diff --git a/src/main/java/com/fzzy/api/service/ApiRemoteService.java b/src/main/java/com/fzzy/api/service/ApiRemoteService.java
index 085adaa..1818c13 100644
--- a/src/main/java/com/fzzy/api/service/ApiRemoteService.java
+++ b/src/main/java/com/fzzy/api/service/ApiRemoteService.java
@@ -35,6 +35,6 @@
* @param data 鎺ㄩ�佹暟鎹�
* @return
*/
- public ResponseDto pushData(ApiParam param, ApiConfs confs,Object data);
+ public ResponseDto pushData(ApiParam param, ApiConfs confs, Object data);
}
diff --git a/src/main/java/com/fzzy/push/whhpjl/Whjl2023HttpClientUtil.java b/src/main/java/com/fzzy/push/whhpjl/Whjl2023HttpClientUtil.java
index 2345b9b..92718e1 100644
--- a/src/main/java/com/fzzy/push/whhpjl/Whjl2023HttpClientUtil.java
+++ b/src/main/java/com/fzzy/push/whhpjl/Whjl2023HttpClientUtil.java
@@ -1,21 +1,15 @@
package com.fzzy.push.whhpjl;
import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.TypeReference;
import com.fzzy.api.entity.ApiConfs;
-import com.fzzy.api.utils.AESUtils;
-import com.fzzy.api.utils.MyMD5Util;
-import com.fzzy.api.utils.SnowflakeIdWorker;
-import com.fzzy.push.gd2022.dto.GD2022AuthToken;
+import com.fzzy.push.whhpjl.dto.WhjlReqDto;
import com.fzzy.push.whhpjl.dto.WhjlRespDto;
import lombok.extern.slf4j.Slf4j;
import java.io.BufferedReader;
import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.lang.reflect.Type;
import java.net.HttpURLConnection;
import java.net.URL;
-import java.util.Map;
/**
* 姝︽眽鍐涚伯鐪佸钩鍙�-涓婁紶鏁版嵁鏈嶅姟绫�
@@ -28,13 +22,12 @@
/**
* post formData
* @param url
- * @param map
* @return
* @throws Exception
*/
@SuppressWarnings("resource")
- public static WhjlRespDto postGetToken(String url, Map<String, Object> map) throws Exception {
- log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------鍙傛暟锛�" + JSON.toJSONString(map) +"---------");
+ public static WhjlRespDto postPushData(String url, WhjlReqDto reqData , ApiConfs apiConfs) throws Exception {
+ log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------鍙傛暟锛�" + reqData +"---------");
BufferedReader in = null;
URL urls = new URL(url);
HttpURLConnection connection = null;
@@ -42,6 +35,7 @@
String rs = "";
WhjlRespDto responseDto;
try {
+
connection = (HttpURLConnection) urls.openConnection();
connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
connection.setDoOutput(true);
@@ -53,87 +47,8 @@
connection.setReadTimeout(30000);
connection.setRequestMethod("POST");
- StringBuffer buffer = new StringBuffer();
outputStream = connection.getOutputStream();
- buffer.append(JSON.toJSONString(map));
- outputStream.write(buffer.toString().getBytes());
- try {
- connection.connect();
- if (connection.getResponseCode() == 200) {
- in = new BufferedReader(new InputStreamReader(connection.getInputStream(), "UTF-8"));
- String line = "";
- while ((line = in.readLine()) != null) {
- rs += line;
- }
- }else{
- log.error("http鐘舵�侊細" + connection.getResponseCode());
- log.error("http娑堟伅锛�" + connection.getResponseMessage());
- }
-
- } catch (Exception e) {
- System.out.println("鍙戠敓寮傚父");
- log.error(e.getMessage(),e);
- rs = null;
- return new WhjlRespDto(99,e.getMessage());
- }
- log.info("---------鎺ュ彛杩斿洖锛�" + rs +"---------");
-
- Type type = new TypeReference<WhjlRespDto<GD2022AuthToken>>() {}.getType();
- responseDto = JSON.parseObject(rs,type);
- if(responseDto == null ) return new WhjlRespDto(99,"鎺ュ彛璇锋眰鍙戠敓鏈煡閿欒");
- return responseDto;
- } finally {
- try {
- outputStream.close();
- if (in != null){
- in.close();
- }
- } catch (Exception e) {
- }
- outputStream = null;
- if (connection != null)
- connection.disconnect();
- connection = null;
- }
- }
-
-
- /**
- * post formData
- * @param url
- * @return
- * @throws Exception
- */
- @SuppressWarnings("resource")
- public static WhjlRespDto postPushData(String url, String data , ApiConfs apiConfs, GD2022AuthToken authToken) throws Exception {
- log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------鍙傛暟锛�" + data +"---------");
- BufferedReader in = null;
- URL urls = new URL(url);
- HttpURLConnection connection = null;
- OutputStream outputStream = null;
- String rs = "";
- WhjlRespDto responseDto;
- try {
- String md = AESUtils.encrypt(data,apiConfs.getPublicKey());
- log.info("---------鎺ュ彛璇锋眰鍦板潃锛�" +url+ "----------瀵嗘枃鍙傛暟锛�" + md +"---------");
- connection = (HttpURLConnection) urls.openConnection();
- connection.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
- connection.setDoOutput(true);
- connection.setDoInput(true);
- connection.setRequestProperty("Accept-Language", "zh-CN,zh;q=0.8");
- connection.setRequestProperty("Accept", "*/*");
- connection.setRequestProperty("Range", "bytes=" + "");
- connection.setRequestProperty("Authorization", "Bearer " + authToken.getAccess_token() );
- connection.setRequestProperty("nonce", AESUtils.encrypt(authToken.getAccess_token() + System.currentTimeMillis(),apiConfs.getPublicKey()));
- connection.setRequestProperty("requestId", AESUtils.encrypt(authToken.getAccess_token() + SnowflakeIdWorker.nextId(),apiConfs.getPublicKey()));
- connection.setRequestProperty("digest", MyMD5Util.encrypt(data));
- connection.setConnectTimeout(20000);
- connection.setReadTimeout(30000);
- connection.setRequestMethod("POST");
- StringBuffer buffer = new StringBuffer();
- buffer.append(md);
- outputStream = connection.getOutputStream();
- outputStream.write(buffer.toString().getBytes("UTF-8"));
+ outputStream.write(reqData.toString().getBytes("UTF-8"));
try {
connection.connect();
if (connection.getResponseCode() == 200) {
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index c571da6..6cb31f9 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -8,9 +8,12 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.service.ApiTriggerService;
+import com.fzzy.api.utils.AESUtils;
import com.fzzy.api.utils.ContextUtil;
+import com.fzzy.api.utils.MyMD5Util;
import com.fzzy.api.utils.RedisUtil;
import com.fzzy.api.view.repository.*;
+import com.fzzy.push.whhpjl.dto.WhjlReqDto;
import com.fzzy.push.whhpjl.dto.WhjlRespDto;
import com.fzzy.whjl.WhjlConstant;
import lombok.Data;
@@ -18,9 +21,7 @@
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.*;
/**
* 姝︽眽鍐涚伯鐪佸钩鍙�-涓婁紶鏁版嵁鏈嶅姟绫�
@@ -56,22 +57,21 @@
public ResponseDto pushData(ApiParam param, ApiConfs conf, Object data) {
String inteId = param.getInteId();
String kqdm = param.getKqdm();
- String bizId = param.getBizId();
try {
if (null == conf) {
conf = apiCommonService.getConf(kqdm);
}
- //娣诲姞LOGO
+ //娣诲姞鏃ュ織
ApiLog apiLog = new ApiLog();
apiLog.setId(ContextUtil.getUUID());
apiLog.setInteId(inteId);
- String jsonData = getJsonData(inteId, data, conf.getApiUrl());
- log.info("鎶ユ枃淇℃伅=" + jsonData);
+ String jsonData = getJsonData(inteId, data);
+ log.info("鏁版嵁鎶ユ枃淇℃伅=" + jsonData);
inteId = getInteId(inteId);
if (StringUtils.isEmpty(inteId)) {
- ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�", bizId);
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒版帴鍙�");
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒版帴鍙�");
apiLogRep.save(apiLog);
@@ -82,22 +82,44 @@
apiLog.setUploadTime(new Date());
if (conf == null) {
- ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�", bizId);
+ ResponseDto responseDto = new ResponseDto(99, "娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
apiLog.setStatus(99);
apiLog.setResult("娌℃湁鑾峰彇鍒颁笂浼犻厤缃�");
apiLogRep.save(apiLog);
return responseDto;
}
+ //灏佽鎺ㄩ�佹暟鎹�
+ WhjlReqDto reqData = new WhjlReqDto();
+ reqData.setId(ContextUtil.getUUID());
+ reqData.setUid(conf.getKqdm());
+ //TODO 鎸囦护id寰呯‘璁�
+ reqData.setOrderid("");
+ reqData.setAppcode(conf.getUserName());
+ reqData.setTimestamp(ContextUtil.getCurTimeMillis());
+ List<Object> list = (List<Object>)data;
+ reqData.setDatalength(list.size());
+ //鏁版嵁杩涜SM4鍔犲瘑
+ reqData.setData(AESUtils.encrypt(jsonData, conf.getPublicKey()));
+ reqData.setOperator("insert");
+ //鎽樿锛屾暟鎹富浣撶殑MD5鍊�
+ reqData.setDigst(MyMD5Util.encrypt(jsonData));
+ //韬唤绛惧悕锛屽搴旂敤鐮乢鎺堟潈鐮乢绔欑偣缂栫爜_鎶ユ枃ID_鏃堕棿鎴宠繘琛孧D5绠楁硶绛惧悕
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(reqData.getAppcode()).append("_");
+ buffer.append(conf.getPublicKey()).append("_");
+ buffer.append(conf.getKqmc()).append("_");
+ buffer.append(reqData.getId()).append("_");
+ buffer.append(reqData.getTimestamp());
+ reqData.setDigst(MyMD5Util.encrypt(buffer.toString()));
- Map<String, Object> map = new HashMap<>();
- WhjlRespDto responseDto = Whjl2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, jsonData, conf, null);
+ WhjlRespDto responseDto = Whjl2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData, conf);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
apiLog.setResult(responseDto.getResult());
apiLogRep.save(apiLog);
ResponseDto resd = new ResponseDto();
resd.setSuccess(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
resd.setMsg(responseDto.getResult());
- //updateGD2022AuthToken(responseDto,conf, token);
+
return resd;
} catch (Exception e) {
log.error(e.getMessage(), e);
@@ -113,7 +135,7 @@
* @return
* @throws Exception
*/
- private String getJsonData(String inteId, Object data, String url) {
+ private String getJsonData(String inteId, Object data) {
return JSON.toJSONString(data);
}
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
index d626048..ab9be50 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlPushService11.java
@@ -1,6 +1,5 @@
package com.fzzy.push.whhpjl;
-import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -9,6 +8,7 @@
import com.fzzy.whjl.WhjlConstant;
import com.fzzy.whjl.dto.WhjlApi1101;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -65,19 +65,20 @@
if (null == items || items.isEmpty()) {
return;
}
-
param.setInteCategory(WhjlConstant.API_CATEGORY_11);
param.setInteId(WhjlConstant.API_CODE_1101);
- ResponseDto responseDto;
- for (WhjlApi1101 data : items) {
- param.setBizId(data.getBizId());
- responseDto = apiRemoteService.pushData(param, data);
-
- if (responseDto.getSuccess() == 0) {
- if (Constant.CZBZ_I.equals(data.getCzbz())) {
-
- //TODO 鏇存柊鎿嶄綔鏍囧織鐘舵��
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ ResponseDto responseDto = apiRemoteService.pushData(param, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ WhjlApi1101 d;
+ for (WhjlApi1101 data : items) {
+ d = new WhjlApi1101();
+ BeanUtils.copyProperties(data, d);
+ if("i".equals(d.getCzbz())){
+ d.setCzbz("u");
+ //TODO 鏇存柊鐘舵�侊紝寰呭疄鐜�
}
}
diff --git a/src/main/java/com/fzzy/push/whhpjl/dto/WhjlReqDto.java b/src/main/java/com/fzzy/push/whhpjl/dto/WhjlReqDto.java
new file mode 100644
index 0000000..f624170
--- /dev/null
+++ b/src/main/java/com/fzzy/push/whhpjl/dto/WhjlReqDto.java
@@ -0,0 +1,64 @@
+package com.fzzy.push.whhpjl.dto;
+
+import lombok.Data;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 姝︽眽鍐涚伯鐪佸钩鍙�-鎺ㄩ�佹暟鎹皝瑁�
+ * @author czt
+ * @date 2023/08/05
+ */
+@Data
+public class WhjlReqDto<T> implements Serializable {
+
+ /**
+ * 鎶ユ枃琛ㄧずid
+ */
+ private String id;
+
+ /**
+ * 韬唤id
+ */
+ private String uid;
+
+ /**
+ * 鎸囦护id
+ */
+ private String orderid;
+
+ /**
+ * 搴旂敤鐮�
+ */
+ private String appcode;
+
+ /**
+ * 鏃堕棿鎴�
+ */
+ private String timestamp;
+
+ /**
+ * 韬唤绛惧悕
+ */
+ private String accesstoken;
+
+ /**
+ * 鏁版嵁鎬绘潯鏁�
+ */
+ private Integer datalength;
+
+ /**
+ * 涓婁紶鏁版嵁(闆嗗悎褰㈠紡)
+ */
+ private String data;
+
+ /**
+ * 鏁版嵁鎽樿
+ */
+ private String digst;
+
+ /**
+ * 鎿嶄綔绫诲瀷
+ */
+ private String operator;
+}
diff --git a/src/main/java/com/fzzy/whjl/WhjlConstant.java b/src/main/java/com/fzzy/whjl/WhjlConstant.java
index 93ef791..9a9528c 100644
--- a/src/main/java/com/fzzy/whjl/WhjlConstant.java
+++ b/src/main/java/com/fzzy/whjl/WhjlConstant.java
@@ -1,23 +1,13 @@
package com.fzzy.whjl;
/**
- * 鍏ㄥ眬闈欐�佺被
+ * 姝︽眽鍐涚伯鐪佸钩鍙�--鍏ㄥ眬闈欐�佺被
*/
public class WhjlConstant {
public static final String API_BIZ_TYPE = "JL";
- public static final String DEFAULT_CODE = "0";
- public static final String YN_N = "N";
- public static final String YN_Y = "Y";
- public static final String APP_NAME = "API";
- /**
- * 榛樿椤剁骇鑺傜偣缂栫爜
- */
- public static final String DEFAULT_PARENT_CODE = "0";
-
- public static String YMDHMS = "yyyy-MM-dd HH:mm:ss";
-
+ /*----------鎺ュ彛鍒嗙被----------*/
/**
* 鎺ュ彛鍒嗙被-鍩虹淇℃伅(鍐涚伯浼佷笟銆佷粨鍌ㄨ鏂借澶�)
*/
@@ -35,6 +25,7 @@
*/
public static String API_CATEGORY_14 = "14";
+ /*----------鎺ュ彛缂栫爜----------*/
/**
* 鎺ュ彛缂栫爜-1101 鍐涚伯浼佷笟淇℃伅鏁版嵁鎺ュ彛
*/
@@ -91,7 +82,6 @@
* 鎺ュ彛缂栫爜-1114 浠撳偍璁惧鎶ュ簾璁板綍鏁版嵁鎺ュ彛
*/
public static String API_CODE_1114 = "1114";
-
/**
* 鎺ュ彛缂栫爜-1201 鍓渚涘簲鍟嗕俊鎭暟鎹帴鍙�
*/
@@ -144,7 +134,6 @@
* 鎺ュ彛缂栫爜-1213 鍑哄叆搴撹褰曟暟鎹帴鍙�
*/
public static String API_CODE_1213 = "1213";
-
/**
* 鎺ュ彛缂栫爜-1301 璐ㄦ鏈烘瀯鏁版嵁鎺ュ彛
*/
@@ -161,7 +150,6 @@
* 鎺ュ彛缂栫爜-1304 鑳借�楄褰曟暟鎹帴鍙�
*/
public static String API_CODE_1304 = "1304";
-
/**
* 鎺ュ彛缂栫爜-1401 鍔ㄥ憳浼佷笟鏁版嵁鎺ュ彛
*/
@@ -192,147 +180,81 @@
public static String API_CODE_1407 = "1407";
/*----------鎺ュ彛璺緞----------*/
- /**
- * 鎺ュ彛缂栫爜-1001 鍐涚伯浼佷笟淇℃伅鎺ュ彛
- */
- public static String API_CODE_JLQYXX = "JLQYXX"; //鎺ュ彛缂栫爜-1101 鍐涚伯浼佷笟淇℃伅 --璺緞(JLQYXX)
- public static String API_CODE_JLZDXX = "JLZDXX"; //鎺ュ彛缂栫爜-1102 鍐涗緵绔欑偣淇℃伅 --璺緞(JLZDXX)
- public static String API_CODE_JLRYXX = "JLRYXX"; //鎺ュ彛缂栫爜-1103 鍐涚伯浜哄憳淇℃伅 --璺緞(JLRYXX)
- public static String API_CODE_FXLYD = "FXLYD"; //鎺ュ彛缂栫爜-1104 鏀惧績绮补搴� --璺緞(FXLYD)
- public static String API_CODE_CFXX = "CFXX"; //鎺ュ彛缂栫爜-1105 浠撴埧淇℃伅 --璺緞(CFXX)
- public static String API_CODE_AJXX = "AJXX"; //鎺ュ彛缂栫爜-1106 寤掗棿淇℃伅 --璺緞(AJXX)
- public static String API_CODE_HWXX = "HWXX"; //鎺ュ彛缂栫爜-1107 璐т綅淇℃伅 --璺緞(HWXX)
- public static String API_CODE_CCSSDZDA = "CCSSDZDA"; //鎺ュ彛缂栫爜-1108 浠撳偍璁炬柦鐢靛瓙妗ｆ --璺緞(CCSSDZDA)
- public static String API_CODE_CCSSWHJL = "CCSSWHJL"; //鎺ュ彛缂栫爜-1109 浠撳偍璁炬柦缁存姢璁板綍 --璺緞(CCSSWHJL)
- public static String API_CODE_CCSSBFJL = "CCSSBFJL"; //鎺ュ彛缂栫爜-1110 浠撳偍璁惧鎶ュ簾璁板綍 --璺緞(CCSBBFJL)
- public static String API_CODE_CCSBXX = "CCSBXX"; //鎺ュ彛缂栫爜-1111 浠撳偍璁惧淇℃伅 --璺緞(CCSBXX)
- public static String API_CODE_CCSBWHJL = "CCSBWHJL"; //鎺ュ彛缂栫爜-1112 浠撳偍璁惧缁存姢璁板綍 --璺緞(CCSBWHJL)
- public static String API_CODE_CCSBWXJL = "CCSBWXJL"; //鎺ュ彛缂栫爜-1113 浠撳偍璁惧缁翠慨璁板綍 --璺緞(CCSBWXJL)
- public static String API_CODE_CCSBBFJL = "CCSBBFJL"; //鎺ュ彛缂栫爜-1114 浠撳偍璁惧鎶ュ簾璁板綍 --璺緞(CCSBBFJL)
- public static String API_CODE_FSGYSXX = "FSGYSXX"; //鎺ュ彛缂栫爜-1201 鍓渚涘簲鍟嗕俊鎭� --璺緞(FSGYSXX)
- public static String API_CODE_FSPPXX = "FSPPXX"; //鎺ュ彛缂栫爜-1202 鍓鍝佺墝淇℃伅 --璺緞(FSPPXX)
- public static String API_CODE_FSCPXX = "FSCPXX"; //鎺ュ彛缂栫爜-1203 鍓浜у搧淇℃伅 --璺緞(FSCPXX)
- public static String API_CODE_KHXX = "KHXX"; //鎺ュ彛缂栫爜-1204 瀹㈡埛淇℃伅 --璺緞(KHXX)
- public static String API_CODE_CCJL = "CCJL"; //鎺ュ彛缂栫爜-1205 绛规帾璁″垝 --璺緞(CCJL)
- public static String API_CODE_DDXX = "DDXX"; //鎺ュ彛缂栫爜-1206 璁㈠崟淇℃伅 --璺緞(DDXX)
- public static String API_CODE_HTXX = "HTXX"; //鎺ュ彛缂栫爜-1207 鍚堝悓淇℃伅 --璺緞(HTXX)
- public static String API_CODE_KCTZ = "KCTZ"; //鎺ュ彛缂栫爜-1208 搴撳瓨鍙拌处 --璺緞(KCTZ)
- public static String API_CODE_KCTZPCXX = "KCTZPCXX"; //鎺ュ彛缂栫爜-1209 搴撳瓨鍙拌处浜у搧鎵规 --璺緞(KCTZPCXX)
- public static String API_CODE_KCTZCRJL = "KCTZCRJL"; //鎺ュ彛缂栫爜-1210 搴撳瓨鍙拌处鍑哄叆璁板綍 --璺緞(KCTZCRJL)
- public static String API_CODE_KCPDJL = "KCPDJL"; //鎺ュ彛缂栫爜-1211 搴撳瓨鐩樼偣璁板綍 --璺緞(KCPDJL)
- public static String API_CODE_KNZCJL = "KNZCJL"; //鎺ュ彛缂栫爜-1212 搴撳唴杞粨璁板綍 --璺緞(KNZCJL)
- public static String API_CODE_CRKJL = "CRKJL"; //鎺ュ彛缂栫爜-1213 鍑哄叆搴撹褰� --璺緞(CRKJL)
- public static String API_CODE_ZJJG = "ZJJG"; //鎺ュ彛缂栫爜-1301 璐ㄦ鏈烘瀯 --璺緞(ZJJG)
- public static String API_CODE_ZJBG = "ZJBG"; //鎺ュ彛缂栫爜-1302 璐ㄦ鎶ュ憡 --璺緞(ZJBG)
- public static String API_CODE_LQJCJL = "LQJCJL"; //鎺ュ彛缂栫爜-1303 绮儏妫�娴嬭褰� --璺緞(LQJCJL)
- public static String API_CODE_NHJL = "NHJL"; //鎺ュ彛缂栫爜-1304 鑳借�楄褰� --璺緞(NHJL)
- public static String API_CODE_DYQY = "DYQY"; //鎺ュ彛缂栫爜-1401 鍔ㄥ憳浼佷笟 --璺緞(DYQY)
- public static String API_CODE_DYXY = "DYXY"; //鎺ュ彛缂栫爜-1402 鍔ㄥ憳鍗忚 --璺緞(DYXY)
- public static String API_CODE_DYNL = "DYNL"; //鎺ュ彛缂栫爜-1403 鍔ㄥ憳鑳藉姏 --璺緞(DYNL)
- public static String API_CODE_DYYJ = "DYYJ"; //鎺ュ彛缂栫爜-1404 鍔ㄥ憳棰勮 --璺緞(DYYJ)
- public static String API_CODE_SCJGDD = "SCJGDD"; //鎺ュ彛缂栫爜-1405 鐢熶骇鍔犲伐璁㈠崟 --璺緞(SCJGDD)
- public static String API_CODE_YSLX = "YSLX"; //鎺ュ彛缂栫爜-1406 杩愯緭璺嚎 --璺緞(YSLX)
- public static String API_CODE_YJDD = "YJDD"; //鎺ュ彛缂栫爜-1407 搴旀�ヨ皟搴� --璺緞(YJDD)
-
- /**
- * 鍥芥爣鍑哄叆搴撶被鍨�
- */
- public static String INOUT_TYPE_14 = "14";
- public static String INOUT_TYPE_2 = "2";
- public static String INOUT_TYPE_15 = "15";
- public static String INOUT_TYPE_1 = "1";
-
- /**
- * 鎿嶄綔鏍囪
- */
- public static String CZBZ_D = "d";
- public static String CZBZ_I = "i";
- public static String CZBZ_U = "u";
-
- /**
- * 鍥剧墖绫诲瀷
- */
- public static String IMG_NAME_TYPE_PMT = "PMT";
- public static String IMG_NAME_TYPE_GL = "GL";
- public static String IMG_NAME_TYPE_GR = "GR";
- public static String IMG_NAME_TYPE_GT = "GT";
- public static String IMG_NAME_TYPE_TL = "TL";
- public static String IMG_NAME_TYPE_TR = "TR";
- public static String IMG_NAME_TYPE_TT = "TT";
- public static String IMG_NAME_TYPE_SL = "SL";
- public static String IMG_NAME_TYPE_SF = "SF";
-
- /**
- * 瀛楀吀鐖剁紪鐮�-鎿嶄綔鏍囧織
- */
- public static String TRIGGER_P_CZBZ = "CZBZ";
-
- /**
- * 瀛楀吀鐖剁紪鐮�-鏄惁
- */
- public static String TRIGGER_P_YN = "YN";
-
- /**
- * 鎺ュ彛1201-鍚堝悓 -涓氬姟绫诲瀷
- */
- public static String TRIGGER_P_HT_YWLX = "HT_YWLX";
-
- /**
- * 鎺ュ彛1201-瀹㈡埛绫诲瀷
- */
- public static String TRIGGER_P_KHLX = "KHLX";
-
- /**
- * 鎺ュ彛1201-缁撶畻涓庡悎鍚屼竴 鑷存��
- */
- public static String TRIGGER_P_JSYHTYZX = "JSYHTYZX";
-
- /**
- * 鎺ュ彛1201-寮�鎴疯
- */
- public static String TRIGGER_P_BANK = "BANK";
-
- /**
- * 璐т綅鐘舵��
- */
- public static String TRIGGER_P_HWZT = "HWZT";
-
- /**
- * 鍥藉埆
- */
- public static String TRIGGER_P_GB = "GB";
-
- /**
- * 绮鍝佺
- */
- public static String TRIGGER_P_LSPZ = "LSPZ";
-
- /**
- * 绮鍝佺
- */
- public static String TRIGGER_P_LSDJ = "LSDJ";
-
- /**
- * 绮鎬ц川
- */
- public static String TRIGGER_P_LSXZ = "LSXZ";
-
- /**
- * 缁撶畻鏂瑰紡
- */
- public static String TRIGGER_P_JSFS = "JSFS";
-
- /**
- * 缁勭粐閮ㄩ棬绫诲瀷
- */
- public static String DEPT_TYPE_10 = "10";
-// public static String DEPT_TYPE_11 = "11";
- public static String DEPT_TYPE_20 = "20";
- public static String DEPT_TYPE_30 = "30";
-
- /**
- * 榛樿鐢ㄦ埛瀵嗙爜锛岀敤鎴风淮鎶ら噸缃瘑鐮佷娇鐢�
- */
- public static final String DEFAULT_USER_PASSWORD = "123456";
+ //鎺ュ彛缂栫爜-1101 鍐涚伯浼佷笟淇℃伅 --璺緞(JLQYXX)
+ public static String API_CODE_JLQYXX = "JLQYXX";
+ //鎺ュ彛缂栫爜-1102 鍐涗緵绔欑偣淇℃伅 --璺緞(JLZDXX)
+ public static String API_CODE_JLZDXX = "JLZDXX";
+ //鎺ュ彛缂栫爜-1103 鍐涚伯浜哄憳淇℃伅 --璺緞(JLRYXX)
+ public static String API_CODE_JLRYXX = "JLRYXX";
+ //鎺ュ彛缂栫爜-1104 鏀惧績绮补搴� --璺緞(FXLYD)
+ public static String API_CODE_FXLYD = "FXLYD";
+ //鎺ュ彛缂栫爜-1105 浠撴埧淇℃伅 --璺緞(CFXX)
+ public static String API_CODE_CFXX = "CFXX";
+ //鎺ュ彛缂栫爜-1106 寤掗棿淇℃伅 --璺緞(AJXX)
+ public static String API_CODE_AJXX = "AJXX";
+ //鎺ュ彛缂栫爜-1107 璐т綅淇℃伅 --璺緞(HWXX)
+ public static String API_CODE_HWXX = "HWXX";
+ //鎺ュ彛缂栫爜-1108 浠撳偍璁炬柦鐢靛瓙妗ｆ --璺緞(CCSSDZDA)
+ public static String API_CODE_CCSSDZDA = "CCSSDZDA";
+ //鎺ュ彛缂栫爜-1109 浠撳偍璁炬柦缁存姢璁板綍 --璺緞(CCSSWHJL)
+ public static String API_CODE_CCSSWHJL = "CCSSWHJL";
+ //鎺ュ彛缂栫爜-1110 浠撳偍璁惧鎶ュ簾璁板綍 --璺緞(CCSBBFJL)
+ public static String API_CODE_CCSSBFJL = "CCSSBFJL";
+ //鎺ュ彛缂栫爜-1111 浠撳偍璁惧淇℃伅 --璺緞(CCSBXX)
+ public static String API_CODE_CCSBXX = "CCSBXX";
+ //鎺ュ彛缂栫爜-1112 浠撳偍璁惧缁存姢璁板綍 --璺緞(CCSBWHJL)
+ public static String API_CODE_CCSBWHJL = "CCSBWHJL";
+ //鎺ュ彛缂栫爜-1113 浠撳偍璁惧缁翠慨璁板綍 --璺緞(CCSBWXJL)
+ public static String API_CODE_CCSBWXJL = "CCSBWXJL";
+ //鎺ュ彛缂栫爜-1114 浠撳偍璁惧鎶ュ簾璁板綍 --璺緞(CCSBBFJL)
+ public static String API_CODE_CCSBBFJL = "CCSBBFJL";
+ //鎺ュ彛缂栫爜-1201 鍓渚涘簲鍟嗕俊鎭� --璺緞(FSGYSXX)
+ public static String API_CODE_FSGYSXX = "FSGYSXX";
+ //鎺ュ彛缂栫爜-1202 鍓鍝佺墝淇℃伅 --璺緞(FSPPXX)
+ public static String API_CODE_FSPPXX = "FSPPXX";
+ //鎺ュ彛缂栫爜-1203 鍓浜у搧淇℃伅 --璺緞(FSCPXX)
+ public static String API_CODE_FSCPXX = "FSCPXX";
+ //鎺ュ彛缂栫爜-1204 瀹㈡埛淇℃伅 --璺緞(KHXX)
+ public static String API_CODE_KHXX = "KHXX";
+ //鎺ュ彛缂栫爜-1205 绛规帾璁″垝 --璺緞(CCJL)
+ public static String API_CODE_CCJL = "CCJL";
+ //鎺ュ彛缂栫爜-1206 璁㈠崟淇℃伅 --璺緞(DDXX)
+ public static String API_CODE_DDXX = "DDXX";
+ //鎺ュ彛缂栫爜-1207 鍚堝悓淇℃伅 --璺緞(HTXX)
+ public static String API_CODE_HTXX = "HTXX";
+ //鎺ュ彛缂栫爜-1208 搴撳瓨鍙拌处 --璺緞(KCTZ)
+ public static String API_CODE_KCTZ = "KCTZ";
+ //鎺ュ彛缂栫爜-1209 搴撳瓨鍙拌处浜у搧鎵规 --璺緞(KCTZPCXX)
+ public static String API_CODE_KCTZPCXX = "KCTZPCXX";
+ //鎺ュ彛缂栫爜-1210 搴撳瓨鍙拌处鍑哄叆璁板綍 --璺緞(KCTZCRJL)
+ public static String API_CODE_KCTZCRJL = "KCTZCRJL";
+ //鎺ュ彛缂栫爜-1211 搴撳瓨鐩樼偣璁板綍 --璺緞(KCPDJL)
+ public static String API_CODE_KCPDJL = "KCPDJL";
+ //鎺ュ彛缂栫爜-1212 搴撳唴杞粨璁板綍 --璺緞(KNZCJL)
+ public static String API_CODE_KNZCJL = "KNZCJL";
+ //鎺ュ彛缂栫爜-1213 鍑哄叆搴撹褰� --璺緞(CRKJL)
+ public static String API_CODE_CRKJL = "CRKJL";
+ //鎺ュ彛缂栫爜-1301 璐ㄦ鏈烘瀯 --璺緞(ZJJG)
+ public static String API_CODE_ZJJG = "ZJJG";
+ //鎺ュ彛缂栫爜-1302 璐ㄦ鎶ュ憡 --璺緞(ZJBG)
+ public static String API_CODE_ZJBG = "ZJBG";
+ //鎺ュ彛缂栫爜-1303 绮儏妫�娴嬭褰� --璺緞(LQJCJL)
+ public static String API_CODE_LQJCJL = "LQJCJL";
+ //鎺ュ彛缂栫爜-1304 鑳借�楄褰� --璺緞(NHJL)
+ public static String API_CODE_NHJL = "NHJL";
+ //鎺ュ彛缂栫爜-1401 鍔ㄥ憳浼佷笟 --璺緞(DYQY)
+ public static String API_CODE_DYQY = "DYQY";
+ //鎺ュ彛缂栫爜-1402 鍔ㄥ憳鍗忚 --璺緞(DYXY)
+ public static String API_CODE_DYXY = "DYXY";
+ //鎺ュ彛缂栫爜-1403 鍔ㄥ憳鑳藉姏 --璺緞(DYNL)
+ public static String API_CODE_DYNL = "DYNL";
+ //鎺ュ彛缂栫爜-1404 鍔ㄥ憳棰勮 --璺緞(DYYJ)
+ public static String API_CODE_DYYJ = "DYYJ";
+ //鎺ュ彛缂栫爜-1405 鐢熶骇鍔犲伐璁㈠崟 --璺緞(SCJGDD)
+ public static String API_CODE_SCJGDD = "SCJGDD";
+ //鎺ュ彛缂栫爜-1406 杩愯緭璺嚎 --璺緞(YSLX)
+ public static String API_CODE_YSLX = "YSLX";
+ //鎺ュ彛缂栫爜-1407 搴旀�ヨ皟搴� --璺緞(YJDD)
+ public static String API_CODE_YJDD = "YJDD";
}
diff --git a/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java b/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java
index c53e50a..d9abf92 100644
--- a/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java
+++ b/src/main/java/com/fzzy/whjl/dto/WhjlApi1101.java
@@ -1,5 +1,6 @@
package com.fzzy.whjl.dto;
+import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
@@ -51,7 +52,13 @@
private String sfyx; //鏄惁鍚敤
private String bz; //澶囨敞
+ //鍗曠嫭澧炲姞锛屼笉杩涜涓婁紶
+ @JSONField(serialize = false)
private String bizId; //涓氬姟ID
+ @JSONField(serialize = false)
private Date updateTime; //鏈�鍚庢洿鏂版椂闂�
+ @JSONField(serialize = false)
private String czbz; //鎿嶄綔鏍囧織
+ @JSONField(serialize = false)
+ private String kqdm; //搴撳尯浠ｇ爜
}
diff --git a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java
index a02abfd..4614b96 100644
--- a/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java
+++ b/src/main/java/com/fzzy/whjl/view/pr/WhjlApi1101PR.java
@@ -3,9 +3,17 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.fzzy.api.Constant;
+import com.fzzy.api.data.ApiParam;
+import com.fzzy.api.dto.ResponseDto;
+import com.fzzy.api.entity.ApiConfs;
+import com.fzzy.api.service.ApiCommonService;
+import com.fzzy.api.service.ApiPushManager;
+import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.whjl.dto.WhjlApi1101;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.List;
/**
@@ -15,6 +23,11 @@
*/
@Component
public class WhjlApi1101PR {
+
+ @Autowired
+ private ApiCommonService apiCommonService;
+ @Autowired
+ private ApiPushManager apiPushManager;
/**
* 鑾峰彇鍒楄〃淇℃伅
@@ -60,6 +73,37 @@
*/
@Expose
public String pushData(List<WhjlApi1101> items) {
- return null;
+ ResponseDto responseDto;
+ String result = "";
+
+ String kqdm = items.get(0).getKqdm();
+ ApiConfs apiConf = apiCommonService.getConf(kqdm);
+
+ if (null == apiConf) return "绯荤粺娌℃湁鑾峰彇鍒板綋鍓嶅簱鍖洪厤缃俊鎭紝鎵ц澶辫触";
+
+ //灏佽鍙傛暟
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1403);
+
+ //鑾峰彇瀹炵幇鎺ュ彛
+ ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
+ if (null == apiService) return "绯荤粺娌℃湁褰撳墠鎺ㄩ�佸崗璁厤缃紝鎵ц澶辫触";
+
+ //鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
+ responseDto = apiService.pushData(param, apiConf, items);
+ if (responseDto.getSuccess() == 0) {
+ //鎺ㄩ�佹垚鍔燂紝鏇存柊鏁版嵁涓婁紶鐘舵��
+ WhjlApi1101 d;
+ for (WhjlApi1101 data : items) {
+ d = new WhjlApi1101();
+ BeanUtils.copyProperties(data, d);
+ if("i".equals(d.getCzbz())){
+ d.setCzbz("u");
+ //TODO 鏇存柊鐘舵�侊紝寰呭疄鐜�
+
+ }
+ }
+ result += responseDto.toString();
+ }
+ return result;
}
}
--
Gitblit v1.9.3