From bf055224492ed78cf937bc94cfe7c33885f86989 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 05 六月 2023 22:38:03 +0800
Subject: [PATCH] 优化嘉定纪委接口5
---
/dev/null | 24 ------------------------
src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java | 5 ++---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java | 5 ++++-
src/main/resources/application-dev.yml | 2 +-
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 19 ++++++++++---------
5 files changed, 17 insertions(+), 38 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
index b182d52..f383d4b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -94,7 +94,7 @@
if(null == sysData.getRecordWeight() || sysData.getRecordWeight() == 0){
continue;
}
- fz35CheckItems = null;
+
//鑾峰彇鍏ュ簱璐ㄦ淇℃伅
fz35CheckItems = fzzySync1203Rep.listInoutCheckItem(sysData.getCheckId(), deptId.substring(0, 4));
if (null == fz35CheckItems || fz35CheckItems.isEmpty()) {
@@ -115,6 +115,9 @@
//璐т綅浠ｇ爜
apiData.setHwdm(api1105.getHwdm());
apiData.setRkywdh(apiData.getRkjydh());
+ if(null == sysData.getFullWeightTime()){
+ sysData.setFullWeightTime(DateUtils.addMinutes(sysData.getRegisterTime(), 5));
+ }
apiData.setQysj(sysData.getFullWeightTime());
apiData.setQyrxm(sysData.getCheckUser());
//鎵︽牱鏂瑰紡 2-鏅鸿兘闅忔満
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/FinanceDto.java b/src/main/java/com/fzzy/push/gd2022/dto/FinanceDto.java
deleted file mode 100644
index 59385fc..0000000
--- a/src/main/java/com/fzzy/push/gd2022/dto/FinanceDto.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.fzzy.push.gd2022.dto;
-
-import lombok.Data;
-import java.io.Serializable;
-import java.util.List;
-
-
-@Data
-public class FinanceDto implements Serializable {
-
- private String id = "2n5asdfnaiugb20482g8e9rhf938gh39";
-
- private String uid = "441322";
-
- private String orderid = "adjgkd86ndksngkse9hf9urbvao2rs23";
-
- private String access_token = "G1pC4K5QEs8P4PQWN+LJJ5spZN+fFBeNvswKljf9EHrDnzUvYd3nHuZB+3zuFMRC65PWWcFHChE5EiDNALlBuAVK2v6L+z8SFzgiS71sbkV9i85DRJoI2jd0xsLXvUlsdKjlTB5rMYQKj08gYVlDBpTrq4r1DdrPawR+DoB+5Yo=";
-
- private String datalength = "131243";
-
- private GDFinanceDto data;
-
- private String digst = "2AB32D9217D463492651EFD35C9801A5";
-}
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index eb626a9..d482ec5 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -334,15 +334,16 @@
shjdjwApi1310.setPznm(api1310.getLspzdm());
shjdjwApi1310.setSkdjbm(api1310.getLsdjdm());
shjdjwApi1310.setJylbbm(api1310.getJylb());
- if (StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())) {
- String[] split = shjdjwApi1310.getJyxm().split(",");
- StringBuilder jyjl = new StringBuilder();
- for (String s : split) {
- jyjl.append(",鍚堟牸");
- }
- shjdjwApi1310.setJyjl(jyjl.toString().substring(1));
- }
-
+// if (StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())) {
+// String[] split = shjdjwApi1310.getJyxm().split(",");
+// StringBuilder jyjl = new StringBuilder();
+// for (String s : split) {
+// jyjl.append(",鍚堟牸");
+// }
+// shjdjwApi1310.setJyjl(jyjl.toString().substring(1));
+// }
+ //璋冩暣涓轰紶閫掓楠屽��
+ shjdjwApi1310.setJyjl(api1310.getJyxmz());
shjdjwApi1310.setZlzbjgpd(api1310.getZbjgpd());
//鏌ヨ鍗曚綅淇℃伅
List<Api1101> listApi1101 = api1101Rep.findPushData(api1310.getKqdm());
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java
index 78b3b81..defab56 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/dto/ShjdjwApi1310.java
@@ -2,17 +2,16 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
+import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-
import java.io.Serializable;
import java.util.Date;
@Data
-@EqualsAndHashCode(callSuper = false)
public class ShjdjwApi1310 implements Serializable {
@PropertyDef(label = "璐ㄦ鎶ュ憡鍗曞彿")
+ @JsonProperty("Zjbgdbh")
private String zjbgdbh;
@PropertyDef(label = "鍗曚綅鍚嶇О")
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 5b88258..fb7210d 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -1,5 +1,5 @@
server:
- port: 8088
+ port: 8090
spring:
datasource:
--
Gitblit v1.9.3