From e6535ab931a79cce25b3c15b47ce59dcb66e69e9 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期四, 25 五月 2023 15:57:21 +0800
Subject: [PATCH] 上海嘉定纪委接口优化1
---
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 63 ++++++++++++++++++-------------
1 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index a5817cf..d1c2d98 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -214,29 +214,30 @@
return JSON.toJSONString(dto);
}
- private ShjdjwApi1404 copyApi1404(Api1404 data) {
+ private ShjdjwApi1404 copyApi1404(Api1404 api1404) {
ShjdjwApi1404 shjdjwApi1404 = new ShjdjwApi1404();
- Api1404 api1404 = data;
+
BeanUtils.copyProperties(api1404, shjdjwApi1404);
//鏌ヨ鍗曚綅淇℃伅
List<Api1101> listApi1101 = api1101Rep.findPushData(api1404.getKqdm());
- if (null != listApi1101 || listApi1101.size() > 0) {
+ if (null != listApi1101 && listApi1101.size() > 0) {
shjdjwApi1404.setDwmc(listApi1101.get(0).getDwmc());
}
+ //TODO 璁″垝骞村害 璁″垝鏁伴噺 宸叉墽琛屾暟閲� 鎵ц姣斾緥 鎷涙爣/绔炰环姣斾緥
shjdjwApi1404.setJhnd("0");
shjdjwApi1404.setJhsl("0");
shjdjwApi1404.setYzxsl("0");
shjdjwApi1404.setZxbl("0");
shjdjwApi1404.setZbjjbl("0");
- //TODO 璁″垝骞村害 璁″垝鏁伴噺 宸叉墽琛屾暟閲� 鎵ц姣斾緥 鎷涙爣/绔炰环姣斾緥
+
return shjdjwApi1404;
}
- private ShjdjwApi1203 copyApi1203(Api1203 data) {
+ private ShjdjwApi1203 copyApi1203(Api1203 api1203) {
ShjdjwApi1203 shjdjwApi1203 = new ShjdjwApi1203();
- Api1203 api1203 = data;
+
BeanUtils.copyProperties(api1203, shjdjwApi1203);
shjdjwApi1203.setQydbh(api1203.getRkjydh());
@@ -250,52 +251,59 @@
return shjdjwApi1203;
}
- private ShjdjwApi1310 copyApi1310(Api1310 data) {
+ private ShjdjwApi1310 copyApi1310(Api1310 api1310) {
ShjdjwApi1310 shjdjwApi1310 = new ShjdjwApi1310();
- Api1310 api1310 = data;
+
BeanUtils.copyProperties(api1310, shjdjwApi1310);
shjdjwApi1310.setZjbgdbh(api1310.getZjbgdh());
shjdjwApi1310.setPznm(api1310.getLspzdm());
shjdjwApi1310.setSkdjbm(api1310.getLsdjdm());
shjdjwApi1310.setJylbbm(api1310.getJylb());
- shjdjwApi1310.setJyjl(api1310.getJyxmz());
+ 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.setZlzbjgpd(api1310.getZbjgpd());
//鏌ヨ鍗曚綅淇℃伅
List<Api1101> listApi1101 = api1101Rep.findPushData(api1310.getKqdm());
- if (null != listApi1101 || listApi1101.size() > 0) {
+ if (null != listApi1101 && listApi1101.size() > 0) {
shjdjwApi1310.setDwmc(listApi1101.get(0).getDwmc());
}
//鏌ヨ浠撴埧淇℃伅
List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1310.getHwdm().substring(0, 25));
- if (null != listApi1103 || listApi1103.size() > 0) {
+ if (null != listApi1103 && listApi1103.size() > 0) {
shjdjwApi1310.setCfmc(listApi1103.get(0).getCfmc());
}
//鏌ヨ寤掗棿淇℃伅
List<Api1104> listApi1104 = api1104Rep.findDataByAjdh(api1310.getHwdm().substring(0, 28));
- if (null != listApi1104 || listApi1104.size() > 0) {
+ if (null != listApi1104 && listApi1104.size() > 0) {
shjdjwApi1310.setAjmc(listApi1104.get(0).getAjmc());
}
//鏌ヨ搴撳尯淇℃伅
List<Api1102> listApi1102 = api1102Rep.findPushData(api1310.getKqdm());
- if (null != listApi1102 || listApi1102.size() > 0) {
+ if (null != listApi1102 && listApi1102.size() > 0) {
shjdjwApi1310.setKdmc(listApi1102.get(0).getKqmc());
}
//鏌ヨ绮搴撳瓨
List<Api1208> listApi1208 = api1208Rep.getDataByHwdm(api1310.getHwdm());
- if (null != listApi1208 || listApi1208.size() > 0) {
+ if (null != listApi1208 && listApi1208.size() > 0) {
shjdjwApi1310.setKdmc(listApi1208.get(0).getLsxzdm());
}
shjdjwApi1310.setPch("0");
return shjdjwApi1310;
}
- private ShjdjwApi1209 copyApi1209(Api1209 data) {
+ private ShjdjwApi1209 copyApi1209(Api1209 api1209) {
ShjdjwApi1209 shjdjwApi1209 = new ShjdjwApi1209();
- Api1209 api1209 = data;
BeanUtils.copyProperties(api1209, shjdjwApi1209);
@@ -306,12 +314,12 @@
shjdjwApi1209.setSysl(api1209.getJzsysl());
//鏌ヨ鍗曚綅淇℃伅
List<Api1101> listApi1101 = api1101Rep.findPushData(api1209.getKqdm());
- if (null != listApi1101 || listApi1101.size() > 0) {
+ if (null != listApi1101 && listApi1101.size() > 0) {
shjdjwApi1209.setDwmc(listApi1101.get(0).getDwmc());
}
//鏌ヨ搴撳尯淇℃伅
List<Api1102> listApi1102 = api1102Rep.findPushData(api1209.getKqdm());
- if (null != listApi1102 || listApi1102.size() > 0) {
+ if (null != listApi1102 && listApi1102.size() > 0) {
shjdjwApi1209.setKdmc(listApi1102.get(0).getKqmc());
}
@@ -323,9 +331,8 @@
return shjdjwApi1209;
}
- private ShjdjwApi1208 copyApi1208(Api1208 data) {
+ private ShjdjwApi1208 copyApi1208(Api1208 api1208) {
ShjdjwApi1208 shjdjwApi1208 = new ShjdjwApi1208();
- Api1208 api1208 = data;
BeanUtils.copyProperties(api1208, shjdjwApi1208);
@@ -336,19 +343,19 @@
//鏌ヨ鍗曚綅淇℃伅
List<Api1101> listApi1101 = api1101Rep.findPushData(api1208.getKqdm());
- if (null != listApi1101 || listApi1101.size() > 0) {
+ if (null != listApi1101 && listApi1101.size() > 0) {
shjdjwApi1208.setDwmc(listApi1101.get(0).getDwmc());
}
//鏌ヨ浠撴埧淇℃伅
List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1208.getHwdm().substring(0, 25));
- if (null != listApi1103 || listApi1103.size() > 0) {
+ if (null != listApi1103 && listApi1103.size() > 0) {
shjdjwApi1208.setCfmc(listApi1103.get(0).getCfmc());
}
//鏌ヨ寤掗棿淇℃伅
List<Api1104> listApi1104 = api1104Rep.findDataByAjdh(api1208.getHwdm().substring(0, 28));
- if (null != listApi1104 || listApi1104.size() > 0) {
+ if (null != listApi1104 && listApi1104.size() > 0) {
shjdjwApi1208.setAjmc(listApi1104.get(0).getAjmc());
}
@@ -358,9 +365,8 @@
return shjdjwApi1208;
}
- private ShjdjwApi1205 copyApi1205(Api1205 data) {
+ private ShjdjwApi1205 copyApi1205(Api1205 api1205) {
ShjdjwApi1205 shjdjwApi1205 = new ShjdjwApi1205();
- Api1205 api1205 = data;
BeanUtils.copyProperties(api1205, shjdjwApi1205);
@@ -375,13 +381,13 @@
//鏌ヨ鍗曚綅淇℃伅
List<Api1101> listApi1101 = api1101Rep.findPushData(api1205.getKqdm());
- if (null != listApi1101 || listApi1101.size() > 0) {
+ if (null != listApi1101 && listApi1101.size() > 0) {
shjdjwApi1205.setDwmc(listApi1101.get(0).getDwmc());
}
//鏌ヨ浠撴埧淇℃伅
List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1205.getHwdm().substring(0, 25));
- if (null != listApi1103 || listApi1103.size() > 0) {
+ if (null != listApi1103 && listApi1103.size() > 0) {
shjdjwApi1205.setCfmc(listApi1103.get(0).getCfmc());
}
@@ -458,6 +464,9 @@
shjdjwApi1202.setJydbh(api1202.getRkywdh());
//杞崲骞村害
shjdjwApi1202.setLhnd(api1202.getShnd());
+ //鍒板簱鏃堕棿銆佺搴撴椂闂�
+ shjdjwApi1202.setDksj(api1202.getDjsj());
+ shjdjwApi1202.setLksj(api1202.getCmsj());
//鎵规鍙�
shjdjwApi1202.setPch("0");
}
--
Gitblit v1.9.3