From 5f94cc1e92d0b31905d927602d095ac3a0a3711a Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期二, 07 五月 2024 19:34:04 +0800
Subject: [PATCH] 陕西省平台提交4-接口联调
---
src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java | 2
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java | 11 ++-
src/main/resources/application-pro5349.yml | 56 ++++++++++++++++++
src/main/java/com/fzzy/conf/WebMvcConfig.java | 3
src/main/java/com/fzzy/push/sx2023/data/SX2023ReqDto.java | 15 +++-
src/main/java/com/fzzy/order/ordersx2023/data/OrderSxReq.java | 19 ++++--
src/main/java/com/fzzy/Application.java | 9 +-
src/main/java/com/fzzy/order/ordersx2023/OrderSxController.java | 4
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java | 5 -
src/main/java/com/fzzy/order/ordersx2023/data/OrderSxResp.java | 4 +
src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java | 35 +++++++----
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 2
12 files changed, 127 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/fzzy/Application.java b/src/main/java/com/fzzy/Application.java
index 6f9f2e6..ca776a4 100644
--- a/src/main/java/com/fzzy/Application.java
+++ b/src/main/java/com/fzzy/Application.java
@@ -6,23 +6,23 @@
import com.bstek.dorado.web.loader.DoradoLoader;
import com.bstek.dorado.web.servlet.DoradoServlet;
import com.fzzy.dorado.DoradoApplicationContextInilializer;
-
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.boot.web.servlet.ServletRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import java.util.LinkedHashSet;
import java.util.Set;
-
@EnableTransactionManagement
@EnableScheduling
@SpringBootApplication
+@EnableAsync
public class Application {
@Bean
@@ -35,10 +35,11 @@
servlet.addUrlMappings("/dorado/*");
return servlet;
}
-
-
+
+
/**
* 璋冩暣FASTJSON鐨勬敞瑙ｆ敮鎸�
+ *
* @return
*/
@Bean
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index c313f56..4bc8cfb 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -114,12 +114,17 @@
} else {
apiData.setLqgsdwdm(fz40DepotStore.getLqgsdwdm());
}
- //绮潈琛屾斂鍖哄垝浠ｇ爜,鐪佺骇鍌ㄥ绮伯鏉冧负鐪佺骇
+
+ apiData.setLqxzqhdm(api1102.getXzqhdm());
if (apiData.getLsxzdm().equals("121")) {
+ //鐪佺骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓虹渷绾�
apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 2) + "0000");
- } else {
- apiData.setLqxzqhdm(api1102.getXzqhdm());
}
+ if (apiData.getLsxzdm().equals("122")) {
+ //甯傜骇鍌ㄥ绮�-绮潈琛屾斂鍖哄垝浠ｇ爜涓哄競绾�
+ apiData.setLqxzqhdm(api1102.getXzqhdm().substring(0, 4) + "00");
+ }
+
//绠＄悊鏂瑰紡-榛樿鐩村偍
if (StringUtils.isEmpty(fz40DepotStore.getManageType())) {
apiData.setGlfs("01");
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
index b093d1d..9f9c454 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1302.java
@@ -61,13 +61,12 @@
apiLog.setId(ContextUtil.getUUID());
try {
List<Fz40Grain> list = fzzySync1302Rep.findByReceiveDate(start, end);
- log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss", start));
- log.info(DateUtils.format("yyyy-MM-dd HH:mm:ss", end));
+
if (null == list || list.isEmpty()) {
log.info("1302---鍚屾鏁版嵁锛氭病鏈夋煡璇㈠埌闇�瑕佸悓姝ョ殑鏁版嵁");
return;
}
- log.info(JSONObject.toJSONString(list));
+
Date syncTime = new Date();
Api1302 api1302;
Api1105 api1105;
diff --git a/src/main/java/com/fzzy/conf/WebMvcConfig.java b/src/main/java/com/fzzy/conf/WebMvcConfig.java
index adfbae3..1bbb349 100644
--- a/src/main/java/com/fzzy/conf/WebMvcConfig.java
+++ b/src/main/java/com/fzzy/conf/WebMvcConfig.java
@@ -54,6 +54,7 @@
.addPathPatterns("/home2")
.addPathPatterns("/home-whjl")
.excludePathPatterns("login")
- .excludePathPatterns("/service/api/order");
+ .excludePathPatterns("/service/api/order")
+ .excludePathPatterns("/Acquisition");
}
}
diff --git a/src/main/java/com/fzzy/order/ordersx2023/OrderSxController.java b/src/main/java/com/fzzy/order/ordersx2023/OrderSxController.java
index f1d852e..da0e742 100644
--- a/src/main/java/com/fzzy/order/ordersx2023/OrderSxController.java
+++ b/src/main/java/com/fzzy/order/ordersx2023/OrderSxController.java
@@ -23,13 +23,13 @@
@Autowired
private OrderSxManager orderSxManager;
/**
- * 鐧诲綍鍏ュ彛
+ * 鎸囦护鍏ュ彛
* @param req
* @return
*/
@SuppressWarnings("unchecked")
@ResponseBody
- @RequestMapping("/")
+ @RequestMapping("")
public OrderSxResp order(@RequestBody OrderSxReq req){
log.debug("闄曡タ鐪佸钩鍙帮細鎺ユ敹鐨勬寚浠や俊鎭�={}", req);
//鍒ゆ柇鍙傛暟
diff --git a/src/main/java/com/fzzy/order/ordersx2023/data/OrderSxReq.java b/src/main/java/com/fzzy/order/ordersx2023/data/OrderSxReq.java
index 90191de..9fc443b 100644
--- a/src/main/java/com/fzzy/order/ordersx2023/data/OrderSxReq.java
+++ b/src/main/java/com/fzzy/order/ordersx2023/data/OrderSxReq.java
@@ -1,5 +1,6 @@
package com.fzzy.order.ordersx2023.data;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -14,32 +15,38 @@
/**
* 鎸囦护ID
*/
- private String Orderid;
+ @JsonProperty("Orderid")
+ private String orderid;
/**
* 鎸囦护鍐呭锛氬績璺虫寚浠ゆ椂锛屽唴瀹逛负绌�
*/
- private String Data;
+ @JsonProperty("Data")
+ private String data;
/**
* 鎸囦护绫诲瀷锛�0-蹇冭烦锛�1-鏁版嵁
*/
- private String Type;
+ @JsonProperty("Type")
+ private String type;
/**
* 寮�濮嬫椂闂�
*/
- private String StartTime;
+ @JsonProperty("StartTime")
+ private String startTime;
/**
* 鎴鏃堕棿
*/
- private String EndTime;
+ @JsonProperty("EndTime")
+ private String endTime;
/**
* 鍗曚綅浠ｇ爜锛�18浣嶇粺涓�淇＄敤鐮�
*/
- private String Dwdm;
+ @JsonProperty("Dwdm")
+ private String dwdm;
/**
* 鎿嶄綔鏍囧織锛歛:鏈笂浼犲拰宸蹭笂浼犵殑鏁版嵁锛堝寘鎷暟鎹睜涓搷浣滄爣蹇椾负d鐨勬暟鎹級 c:鏈笂浼犲拰宸蹭笂浼犵殑鏁版嵁锛堜笉鍖呮嫭鏁版嵁姹犱腑鎿嶄綔鏍囧織涓篸鐨勬暟鎹級 n:鏈笂浼犺繃鐨勬暟鎹�
diff --git a/src/main/java/com/fzzy/order/ordersx2023/data/OrderSxResp.java b/src/main/java/com/fzzy/order/ordersx2023/data/OrderSxResp.java
index 27b9ff9..8dc3a79 100644
--- a/src/main/java/com/fzzy/order/ordersx2023/data/OrderSxResp.java
+++ b/src/main/java/com/fzzy/order/ordersx2023/data/OrderSxResp.java
@@ -1,5 +1,7 @@
package com.fzzy.order.ordersx2023.data;
+import lombok.Data;
+
import java.io.Serializable;
/**
@@ -7,6 +9,7 @@
* @Author CZT
* @Date 2024/4/23 11:16
*/
+@Data
public class OrderSxResp implements Serializable {
/**
*
@@ -14,6 +17,7 @@
private static final long serialVersionUID = -6714158228489303453L;
private String code;
+
public OrderSxResp() {
}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index c4f80bd..91622ed 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -1368,7 +1368,7 @@
}
private String getYwdh(String wjlx, String wjmc, String ywdh) {
String[] s = wjmc.split("_");
- if ("2".equals(wjlx) || "3".equals(wjlx)) {
+ if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) {
ywdh = s[1];
}
return ywdh;
diff --git a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
index e63a1c0..454826d 100644
--- a/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sx2023/SX2023ApiRemoteService.java
@@ -84,9 +84,8 @@
return responseDto;
}
- List<Map<String, Object>> listData = getListData(param.getInteId(), data, conf);
- log.info("鎺ュ彛鏁版嵁淇℃伅=" + listData);
- apiLog.setData(listData.toString());
+ String jsonData = getListData(param.getInteId(), data, conf);
+ apiLog.setData(jsonData);
apiLog.setKqdm(kqdm);
apiLog.setUploadTime(new Date());
@@ -117,9 +116,13 @@
//18浣嶅崟浣嶄唬鐮�
reqData.setDwdm(conf.getKqdm().substring(0, 18));
//鍔犲瘑鏁版嵁涓讳綋
-// reqData.setBody(listData);
- reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), listData.toString()));
- log.debug("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
+ reqData.setBody(jsonData);
+ log.info("涓婃姤鏁版嵁淇℃伅-鍔犲瘑鍓�=" + JSON.toJSONString(reqData));
+
+ reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), jsonData));
+ log.info("涓婃姤鏁版嵁淇℃伅-鍔犲瘑鍚�=" + JSON.toJSONString(reqData));
+
+ reqData.setBody(SXAESUtils.encryptByAES(conf.getPublicKey(), jsonData));
String resp = SX2023HttpClientUtil.postPushData(conf.getApiUrl(), JSON.toJSONString(reqData));
if (StringUtils.isEmpty(resp)) {
log.error("鏁版嵁涓婁紶闄曡タ鐪佸钩鍙板け璐ワ紝鏁版嵁={}", reqData);
@@ -129,8 +132,8 @@
apiLogRep.save(apiLog);
return responseDto;
}
- resp = SXAESUtils.decryptByAES(conf.getPassword(), resp);
- SX2023RespDto sx2023RespDto = JSONObject.parseObject(JSONObject.toJSONString(resp), SX2023RespDto.class);
+
+ SX2023RespDto sx2023RespDto = JSONObject.parseObject(resp, SX2023RespDto.class);
if (null == sx2023RespDto || null == sx2023RespDto.getMsgBody()) {
log.error("鏁版嵁涓婁紶闄曡タ鐪佸钩鍙板け璐ワ紝鏁版嵁={}", reqData);
@@ -177,7 +180,7 @@
* @param conf
* @return
*/
- private List<Map<String, Object>> getListData(String inteId, Object data, ApiConfs conf) {
+ private String getListData(String inteId, Object data, ApiConfs conf) {
List<Map<String, Object>> result = new ArrayList<>();
Map<String, Object> map = new HashMap<>();
String inteIdUrl = getInteId(inteId);
@@ -198,7 +201,7 @@
map.put(inteIdUrl, list);
}
result.add(map);
- return result;
+ return JSON.toJSONString(result);
}
/**
@@ -252,8 +255,12 @@
return apiData;
}
if (Constant.API_CODE_1109.equals(inteId)) {
+ Api1109 api1109 = (Api1109) data;
SX2023Api1109 apiData = new SX2023Api1109();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1109, apiData);
+
+ //璁剧疆鏂囦欢娴�
+ apiData.setWjl(FileUtils.fileToByteString(api1109.getWjdz()));
return apiData;
}
if (Constant.API_CODE_1110.equals(inteId)) {
@@ -362,8 +369,12 @@
return apiData;
}
if (Constant.API_CODE_1307.equals(inteId)) {
+ Api1307 api1307 = (Api1307) data;
SX2023Api1307 apiData = new SX2023Api1307();
- BeanUtils.copyProperties(data, apiData);
+ BeanUtils.copyProperties(api1307, apiData);
+
+ //璁剧疆鏂囦欢娴�
+ apiData.setCntxwjl(FileUtils.fileToByteString(api1307.getWjdz()));
return apiData;
}
if (Constant.API_CODE_1308.equals(inteId)) {
diff --git a/src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java b/src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java
index 40d25f1..1973466 100644
--- a/src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java
+++ b/src/main/java/com/fzzy/push/sx2023/SX2023OrderServiceImpl.java
@@ -59,7 +59,7 @@
//鎸囦护瀛樺叆缂撳瓨锛屾椂鏁�24灏忔椂
String key = RedisConst.buildKey(RedisConst.KYE_ORDER, apiConfs.getKqdm());
- redisUtil.set(key, req, 59 * 60 * 24);
+ redisUtil.set(key, req.getOrderid(), 59 * 60 * 24);
ApiParam param = new ApiParam();
param.setPushProtocol(apiConfs.getPushProtocol());
diff --git a/src/main/java/com/fzzy/push/sx2023/data/SX2023ReqDto.java b/src/main/java/com/fzzy/push/sx2023/data/SX2023ReqDto.java
index 023420e..6e41d14 100644
--- a/src/main/java/com/fzzy/push/sx2023/data/SX2023ReqDto.java
+++ b/src/main/java/com/fzzy/push/sx2023/data/SX2023ReqDto.java
@@ -1,5 +1,6 @@
package com.fzzy.push.sx2023.data;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.io.Serializable;
@@ -9,7 +10,7 @@
* @Date 2024/4/23 15:02
*/
@Data
-public class SX2023ReqDto<T> implements Serializable {
+public class SX2023ReqDto implements Serializable {
/**
* 鎶ユ枃鏍囪瘑
@@ -24,17 +25,20 @@
/**
* 鍗曚綅缂栫爜锛�11浣�
*/
- private String OrgNo;
+ @JsonProperty("OrgNo")
+ private String orgNo;
/**
* 鍗曚綅鍚嶇О
*/
- private String OrgName;
+ @JsonProperty("OrgName")
+ private String orgName;
/**
* 鍙戣捣鏃堕棿
*/
- private String SendTime;
+ @JsonProperty("SendTime")
+ private String sendTime;
/**
* 鍗曚綅浠ｇ爜
@@ -44,6 +48,7 @@
/**
* 鏁版嵁涓讳綋鍐呭锛氬姞瀵�
*/
- private T Body;
+ @JsonProperty("Body")
+ private String body;
}
diff --git a/src/main/resources/application-pro5349.yml b/src/main/resources/application-pro5349.yml
new file mode 100644
index 0000000..62a316d
--- /dev/null
+++ b/src/main/resources/application-pro5349.yml
@@ -0,0 +1,56 @@
+########################## 闄曡タ鏌炴按鍘� ##########################
+server:
+ port: 8090
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: Fzzy@#$%5432..K
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: Fzzy@#$%5432..K
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 1
+ host: 127.0.0.1
+ port: 6379
+ password: Redispwd..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5348
+ file-path: D:/IGDS-API/FILE/
+ img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3