From 86d368337175a7d7eed5e9330bd80a838ab4f396 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 17:25:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
index 6054fda..0d9cfac 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1305.java
@@ -46,7 +46,7 @@
* @param start 璧峰鏃堕棿
* @param end 鎴鏃堕棿
*/
- public void syncData(String deptId, Date start, Date end) {
+ public void syncData(String kqdm, String deptId, Date start, Date end) {
log.info("-------------1305鎺ュ彛鏁版嵁寮�濮嬪悓姝�------------------");
//鍚屾鏁版嵁锛屽彧璁板綍澶辫触鐨勪俊鎭�
ApiLog apiLog = new ApiLog();
@@ -76,9 +76,9 @@
BeanUtils.copyProperties(fzAreationData, api1305);
- api1305.setTfzydh(fzAreationData.getId());
+ api1305.setTfzydh(api1105.getHwdm() + fzAreationData.getId());
api1305.setTfrq(fzAreationData.getStartTime());
- api1305.setCfdm(fzAreationData.getDeptId());
+ api1305.setCfdm(api1105.getHwdm().substring(0,25));
api1305.setTfmd(fzAreationData.getObjective());
api1305.setTflx(fzAreationData.getType());
api1305.setFdxs(fzAreationData.getWindNetType());
@@ -94,10 +94,12 @@
api1305.setTfsc(fzAreationData.getLongTime());
api1305.setZhgxsj(fzAreationData.getUpdateTime());
+ api1305.setKqdm(kqdm);
+ api1305.setBizId(fzAreationData.getId());
api1305List = api1305Rep.getDataById(api1305.getTfzydh());
- if(null == api1305List || api1305List.isEmpty()){
+ if (null == api1305List || api1305List.isEmpty()) {
api1305.setCzbz(Constant.CZBZ_I);
- }else {
+ } else {
api1305.setCzbz(api1305List.get(0).getCzbz());
}
api1305Rep.save(api1305);
--
Gitblit v1.9.3