From 13391e649a65a374e390066a35b52c61a6feaa3f Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 14 十一月 2023 21:19:40 +0800
Subject: [PATCH] 调整心跳指令返回
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 82 ++++++++++++++++++++++++++---------------
1 files changed, 52 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 25bdc64..52c60e7 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -47,6 +47,8 @@
@Autowired
private Api1102Rep api1102Rep;
@Autowired
+ private Api1103Rep api1103Rep;
+ @Autowired
private Api1104Rep api1104Rep;
@Autowired
private Api1208Rep api1208Rep;
@@ -221,6 +223,21 @@
if (SH2023Constant.SH_2023_API_CODE_1104.equals(inteId)) {
SH2023Api1104 api1104 = new SH2023Api1104();
Api1104 apiData = (Api1104) data;
+
+ //鏌ヨ浠撴埧淇℃伅
+ List<Api1103> api1103List = api1103Rep.findPushDataByCfdm(apiData.getCfbh());
+ List<Api1104> api1104List = api1104Rep.findDataByCfbh(apiData.getCfbh());
+ int num = 2;
+ if (null != api1104List && api1104List.size() > 0) {
+ num = api1104List.size();
+ }
+ if (null != api1103List && api1103List.size() > 0) {
+ Api1103 api1103 = api1103List.get(0);
+ BeanUtils.copyProperties(api1103, api1104);
+ api1104.setCwc(api1103.getCwc() / num);
+ api1104.setCnc(api1103.getCnc() / num);
+ api1104.setSjcr(api1103.getSjcr() / num);
+ }
BeanUtils.copyProperties(apiData, api1104);
api1104.setAjdm(apiData.getAjdh());
api1104.setCfdm(apiData.getCfbh());
@@ -352,13 +369,13 @@
//璁剧疆绮杞崲骞村害
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
- if(null != api1404List && api1404List.size() >0){
+ if (null != api1404List && api1404List.size() > 0) {
api1202.setLhnd(api1404List.get(0).getShnd());
}
//璁剧疆鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1202.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -384,7 +401,7 @@
}
//璁剧疆鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1203.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
@@ -399,13 +416,19 @@
api1204.setBjw(ShAreaBjw.getBjw(code));
//璁剧疆鎵规鍙�
- if(StringUtils.isNotEmpty(api1204.getHth())){
+ if (StringUtils.isNotEmpty(api1204.getHth())) {
List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
- if(null != api1202List && api1202List.size() > 0){
+ if (null != api1202List && api1202List.size() > 0) {
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202List.get(0).getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1204.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
}
+ }
+ }
+ if (StringUtils.isNotEmpty(api1204.getHwdm())) {
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1204.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1204.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
}
}
@@ -430,13 +453,13 @@
//璁剧疆绮杞崲骞村害
List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
- if(null != api1404List && api1404List.size() >0){
+ if (null != api1404List && api1404List.size() > 0) {
api1205.setLhnd(api1404List.get(0).getShnd());
}
//璁剧疆鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
@@ -450,16 +473,15 @@
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
//鎵规鍙�
- if(StringUtils.isNotEmpty(api1206.getHth())){
+ if (StringUtils.isNotEmpty(api1206.getHth())) {
List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
- if(null != api1205List && api1205List.size() > 0){
+ if (null != api1205List && api1205List.size() > 0) {
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205List.get(0).getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
}
}
}
-
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1206);
return api1206;
@@ -474,7 +496,7 @@
api1207.setBjw(ShAreaBjw.getBjw(code));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1207.setPch(api1207.getDchwdm() + api1208List.get(0).getShnd());
}
@@ -510,7 +532,7 @@
api1209.setBjw(ShAreaBjw.getBjw(code));
api1209.setJzrq(apiData.getYwrq());
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1209.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
}
@@ -525,7 +547,7 @@
BeanUtils.copyProperties(apiData, api1210);
api1210.setBjw(ShAreaBjw.getBjw(code));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
@@ -542,7 +564,7 @@
api1211.setBjw(ShAreaBjw.getBjw(code));
api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1211.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
@@ -580,7 +602,7 @@
api1302.setLwmx(apiData.getLswdzjh());
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1302.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
@@ -594,7 +616,7 @@
BeanUtils.copyProperties(apiData, api1303);
api1303.setBjw(ShAreaBjw.getBjw(code));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -607,7 +629,7 @@
BeanUtils.copyProperties(apiData, api1304);
api1304.setBjw(ShAreaBjw.getBjw(code));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
@@ -693,8 +715,8 @@
String lsxzdm = "122";
String pch = "";
List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
- if(null != api1208List && api1208List.size() > 0){
- if(StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())){
+ if (null != api1208List && api1208List.size() > 0) {
+ if (StringUtils.isNotEmpty(api1208List.get(0).getLsxzdm())) {
lsxzdm = api1208List.get(0).getLsxzdm();
pch = apiData.getHwdm() + api1208List.get(0).getShnd();
}
@@ -702,16 +724,16 @@
//璁剧疆鎵规鍙�
api1310.setPch(pch);
api1310.setLsxzdm(lsxzdm);
- if (api1310.getYpsl() == 0.0){
+ if (api1310.getYpsl() == 0.0) {
api1310.setYpsl(5.0);
}
- if(StringUtils.isEmpty(api1310.getQyrxm())){
+ if (StringUtils.isEmpty(api1310.getQyrxm())) {
api1310.setQyrxm("鎵︽牱浜�");
}
- if(StringUtils.isEmpty(api1310.getJdrxm())){
+ if (StringUtils.isEmpty(api1310.getJdrxm())) {
api1310.setJdrxm("鐩戠潱浜�");
}
- if(StringUtils.isEmpty(api1310.getShrxm())){
+ if (StringUtils.isEmpty(api1310.getShrxm())) {
api1310.setShrxm("瀹℃牳浜�");
}
@@ -779,7 +801,7 @@
SH2023Api2102 apiData = new SH2023Api2102();
BeanUtils.copyProperties(data, apiData);
List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getDrhwdm());
- if(null != api1208List && api1208List.size() > 0){
+ if (null != api1208List && api1208List.size() > 0) {
apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -814,12 +836,12 @@
return data;
}
- private String getWjmc(String wjlx, String wjmc){
- if("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)){
- if(wjmc.endsWith(".jpg")) {
+ private String getWjmc(String wjlx, String wjmc) {
+ if ("2".equals(wjlx) || "3".equals(wjlx) || "4".equals(wjlx) || "5".equals(wjlx)) {
+ if (wjmc.endsWith(".jpg")) {
wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
}
- if(wjmc.endsWith(".png")) {
+ if (wjmc.endsWith(".png")) {
wjmc = wjmc.replaceAll(".png", "_00.png");
}
}
--
Gitblit v1.9.3