From 6fc5e2138599d7ef44bfc4b261f80e65cd6a43f6 Mon Sep 17 00:00:00 2001
From: 陈战涛 <chenzhantao7055@sina.com>
Date: 星期二, 30 五月 2023 09:20:23 +0800
Subject: [PATCH] 上海嘉定纪委接口优化4
---
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 50 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index 6060f6e..bba2223 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -22,6 +22,7 @@
import org.springframework.stereotype.Service;
import java.text.DateFormat;
+import java.text.DecimalFormat;
import java.util.*;
/**
@@ -49,6 +50,8 @@
private Api1102Rep api1102Rep;
@Autowired
private Api1103Rep api1103Rep;
+ @Autowired
+ private Api1105Rep api1105Rep;
@Autowired
private Api1202Rep api1202Rep;
@Autowired
@@ -235,9 +238,13 @@
private ShjdjwApi1403 copyApi1403(Api1403 api1403) {
ShjdjwApi1403 shjdjwApi1403 = new ShjdjwApi1403();
BeanUtils.copyProperties(api1403, shjdjwApi1403);
+
List<Double> lhsl = getLhsl(api1403);
- shjdjwApi1403.setLrsl(lhsl.get(1));
- shjdjwApi1403.setLrsl(lhsl.get(0));
+ if (null != lhsl && lhsl.size() > 0) {
+ shjdjwApi1403.setLrsl(lhsl.get(1));
+ shjdjwApi1403.setLrsl(lhsl.get(0));
+ }
+
shjdjwApi1403.setJhbm(api1403.getLhjhdh());
shjdjwApi1403.setPch("0");
return shjdjwApi1403;
@@ -245,20 +252,21 @@
/**
* 鑾峰彇杞叆鍜岃疆鍑洪噸閲�
+ *
* @param api1403
* @return
*/
private List<Double> getLhsl(Api1403 api1403) {
List<Api1404> api1404List = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
List<Double> lhsl = new ArrayList<>();
- if(null != api1404List && api1404List.size() > 0){
+ if (null != api1404List && api1404List.size() > 0) {
// double sum = api1404List.stream().mapToDouble(Api1404::getLhsl).summaryStatistics().getSum();
double lcSum = api1404List.stream()
- .filter(x->x.getLhlx().equals("1"))
+ .filter(x -> x.getLhlx().equals("1"))
.mapToDouble(Api1404::getLhsl)
.summaryStatistics().getSum();
double lrSum = api1404List.stream()
- .filter(x->x.getLhlx().equals("2"))
+ .filter(x -> x.getLhlx().equals("2"))
.mapToDouble(Api1404::getLhsl)
.summaryStatistics().getSum();
lhsl.add(lcSum);
@@ -274,18 +282,20 @@
// 璁″垝鏁伴噺
List<Double> lhsl = getLhsl(api1403);
- Double sum = lhsl.stream().reduce(0d, Double::sum);
+ Double sum = 0.0;
+ if (null != lhsl && lhsl.size() > 0) {
+ sum = lhsl.stream().reduce(0d, Double::sum);
+ }
// 宸叉墽琛屾暟閲�
List<Api1202> api1202List = api1202Rep.getDataByTime(api1403.getKszxrq(), api1403.getJzzxrq());
-// DateUtils.format("yyyy-MM-dd HH:mm:ss", api1403.getKszxrq()),
-// DateUtils.format("yyyy-MM-dd HH:mm:ss", api1403.getJzzxrq()));
+
Double yzxsl = api1202List.stream()
.mapToDouble(Api1202::getJz)
.summaryStatistics().getSum();
- shjdjw1502.setJhsl(sum.toString());
- shjdjw1502.setYzxsl(yzxsl.toString());
+ shjdjw1502.setJhsl(new DecimalFormat("0.00").format(sum));
+ shjdjw1502.setYzxsl(new DecimalFormat("0.00").format(yzxsl));
//鎵ц姣斾緥
- shjdjw1502.setZxbl(String.valueOf((yzxsl/sum*100)));
+ shjdjw1502.setZxbl(String.valueOf((yzxsl / sum * 100)));
// 鎷涙爣/绔炰环姣斾緥
shjdjw1502.setZbjjbl("100");
@@ -301,6 +311,10 @@
shjdjwApi1203.setQydbh(api1203.getRkjydh());
shjdjwApi1203.setHwbm(api1203.getHwdm());
+ List<Api1105> list = api1105Rep.findPushDataByHwdm(api1203.getHwdm());
+ if(null != list && list.size() > 0){
+ shjdjwApi1203.setHwbm(list.get(0).getHwmc());
+ }
shjdjwApi1203.setYpbm(api1203.getRkywdh());
shjdjwApi1203.setJyjg(api1203.getJyz());
shjdjwApi1203.setJyjl(api1203.getJyjg());
@@ -319,7 +333,7 @@
shjdjwApi1310.setPznm(api1310.getLspzdm());
shjdjwApi1310.setSkdjbm(api1310.getLsdjdm());
shjdjwApi1310.setJylbbm(api1310.getJylb());
- if(StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())){
+ if (StringUtils.isNotEmpty(shjdjwApi1310.getJyxm())) {
String[] split = shjdjwApi1310.getJyxm().split(",");
StringBuilder jyjl = new StringBuilder();
for (String s : split) {
@@ -367,7 +381,7 @@
BeanUtils.copyProperties(api1209, shjdjwApi1209);
shjdjwApi1209.setSydbh(api1209.getSydh());
- shjdjwApi1209.setHwbm(api1209.getHwdm());
+
shjdjwApi1209.setRksl(api1209.getRkjz());
shjdjwApi1209.setCksl(api1209.getCkjz());
shjdjwApi1209.setSysl(api1209.getJzsysl());
@@ -380,6 +394,12 @@
List<Api1102> listApi1102 = api1102Rep.findPushData(api1209.getKqdm());
if (null != listApi1102 && listApi1102.size() > 0) {
shjdjwApi1209.setKdmc(listApi1102.get(0).getKqmc());
+ }
+ //璐т綅淇℃伅
+ shjdjwApi1209.setHwbm(api1209.getHwdm());
+ List<Api1105> list = api1105Rep.findPushDataByHwdm(api1209.getHwdm());
+ if(null != list && list.size() > 0){
+ shjdjwApi1209.setHwbm(list.get(0).getHwmc());
}
shjdjwApi1209.setNx(api1209.getYwrq());
@@ -508,6 +528,10 @@
String ywdh = api1202.getRkywdh();
shjdjwApi1202.setYwdh(ywdh);
shjdjwApi1202.setHwbm(api1202.getHwdm());
+ List<Api1105> list = api1105Rep.findPushDataByHwdm(api1202.getHwdm());
+ if(null != list && list.size() > 0){
+ shjdjwApi1202.setHwbm(list.get(0).getHwmc());
+ }
shjdjwApi1202.setPzbm(api1202.getLspzdm());
shjdjwApi1202.setLqxzbm(api1202.getLsxzdm());
shjdjwApi1202.setZjkl(api1202.getZjklxj());
--
Gitblit v1.9.3