From caf2599a9869244ded811018811c37a2aabac3fc Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 一月 2025 11:29:05 +0800
Subject: [PATCH] 优化测温协议
---
src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
index 028f4b8..414638b 100644
--- a/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
+++ b/src/main/java/com/fzzy/push/shjdjw2023/ShjdjwApiRemoteService2023.java
@@ -17,11 +17,13 @@
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;
import java.text.DateFormat;
+import java.text.DecimalFormat;
import java.util.*;
/**
@@ -49,6 +51,8 @@
private Api1102Rep api1102Rep;
@Autowired
private Api1103Rep api1103Rep;
+ @Autowired
+ private Api1105Rep api1105Rep;
@Autowired
private Api1202Rep api1202Rep;
@Autowired
@@ -285,13 +289,12 @@
}
// 宸叉墽琛屾暟閲�
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)));
@@ -309,6 +312,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());
@@ -327,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());
@@ -375,7 +383,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());
@@ -388,6 +396,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());
@@ -452,10 +466,10 @@
shjdjwApi1205.setDwmc(listApi1101.get(0).getDwmc());
}
- //鏌ヨ浠撴埧淇℃伅
- List<Api1103> listApi1103 = api1103Rep.findPushDataByCfdm(api1205.getHwdm().substring(0, 25));
- if (null != listApi1103 && listApi1103.size() > 0) {
- shjdjwApi1205.setCfmc(listApi1103.get(0).getCfmc());
+ //鏌ヨ璐т綅淇℃伅
+ List<Api1105> listApi1105 = api1105Rep.findPushDataByHwdm(api1205.getHwdm());
+ if (null != listApi1105 && listApi1105.size() > 0) {
+ shjdjwApi1205.setCfmc(listApi1105.get(0).getHwmc());
}
shjdjwApi1205.setDjlx("0");
@@ -467,6 +481,7 @@
shjdjwApi1205.setDksj(api1205.getDjsj());
shjdjwApi1205.setLksj(api1205.getCmsj());
+ shjdjwApi1205.setLhnd(DateFormatUtils.format(api1205.getCmsj(), "yyyy"));
shjdjwApi1205.setPch("0");
return shjdjwApi1205;
}
@@ -516,6 +531,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