From a137500cf7a3f558fef9aafc9f608c06fbbc7dff Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 05 六月 2023 08:52:01 +0800
Subject: [PATCH] 优化嘉定纪委接口
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java | 13 ++++---------
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java | 4 ++--
src/main/resources/application-dev.yml | 12 ++++++++++--
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java | 4 ++--
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 2 ++
src/main/resources/application.yml | 2 +-
6 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
index 3dfae3c..8d4540b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1202.java
@@ -119,8 +119,8 @@
apiData.setXxdz(sysData.getUserAddress());
- //杩愯緭宸ュ叿锛岄粯璁ゆ苯杞︼紝TODO>> 寰呰皟鏁翠负鏍规嵁鏁版嵁搴撹幏鍙�
- apiData.setYsgj("1");
+ //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
index d001fda..45ac8b1 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1205.java
@@ -115,8 +115,8 @@
}
- //杩愯緭宸ュ叿锛岄粯璁ゆ苯杞�
- apiData.setYsgj("1");
+ //杩愯緭宸ュ叿锛岃嫢涓虹┖锛屽垯榛樿缁�1-姹借溅
+ apiData.setYsgj(StringUtils.isEmpty(sysData.getTransType()) ? "1":sysData.getTransType());
//杞﹁埞鍙�
apiData.setCch(sysData.getPlateNum());
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
index 6778bbd..df350a1 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -71,8 +71,6 @@
Api1208 apiData;
Api1105 api1105;
- // List<GbArea> gbAreaList;
- List<Api1208> api1208List;
for (Fz35Depot fz35Depot : list) {
//鑾峰彇璐т綅淇℃伅
@@ -143,13 +141,10 @@
apiData.setBizId(fz35Depot.getId());
apiData.setKqdm(kqdm);
apiData.setSyncTime(new Date());
- api1208List = api1208Rep.getDataById(api1105.getHwdm());
- if(null == api1208List || api1208List.isEmpty()){
- apiData.setCzbz(Constant.CZBZ_I);
- }else {
- apiData.setCzbz(api1208List.get(0).getCzbz());
- }
- apiData.setId(api1105.getHwdm());
+
+ //搴撳瓨姣忔鏂板
+ apiData.setCzbz(Constant.CZBZ_I);
+ apiData.setId(ContextUtil.getCurTimeMillis());
//淇濆瓨鏁版嵁
api1208Rep.save(apiData);
}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index bba2223..eb626a9 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -17,6 +17,7 @@
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -479,6 +480,7 @@
shjdjwApi1205.setDksj(api1205.getDjsj());
shjdjwApi1205.setLksj(api1205.getCmsj());
+ shjdjwApi1205.setLhnd(DateFormatUtils.format(api1205.getCmsj(), "yyyy"));
shjdjwApi1205.setPch("0");
return shjdjwApi1205;
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4df460a..5b88258 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -5,13 +5,21 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
+# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
username: root
password: Abc123..
driver-class-name: com.mysql.jdbc.Driver
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bf2561d..0e225ad 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
########################## Server ##########################
spring:
profiles:
- active: pro
+ active: dev
application:
name: igds-api
main:
--
Gitblit v1.9.3