From 2c08948a713f834f3a6b033495291bfddcbc0c50 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 22 十一月 2023 19:26:14 +0800
Subject: [PATCH] 上海接口新增温湿度数据封装
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 358 ++++++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 277 insertions(+), 81 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index cef14d7..7bee33f 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -16,6 +16,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
+import com.fzzy.api.utils.NumberUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -43,7 +44,11 @@
@Autowired
private ApiLogRep apiLogRep;
@Autowired
+ private Api1101Rep api1101Rep;
+ @Autowired
private Api1102Rep api1102Rep;
+ @Autowired
+ private Api1103Rep api1103Rep;
@Autowired
private Api1104Rep api1104Rep;
@Autowired
@@ -54,6 +59,8 @@
private Api1202Rep api1202Rep;
@Autowired
private Api1205Rep api1205Rep;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Override
public String getProtocol() {
@@ -138,7 +145,7 @@
reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
-
+ log.info("涓婃姤鏁版嵁淇℃伅=" + JSON.toJSONString(reqData));
SH2023RespDto responseDto = SH2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, JSON.toJSONString(reqData), conf);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
@@ -217,9 +224,25 @@
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());
+ api1104.setLsxzdm("122");
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1104);
@@ -270,10 +293,7 @@
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
api1109.setWjl(JSON.toJSONString(map));
//涓婃捣甯傚钩鍙版枃浠跺悕绉拌鍒欙細搴撳尯缂栫爜_涓氬姟娴佹按鍙穇鍒嗙被鐮乢椤哄簭鐮�.jpg锛屼緥濡傦細91310114703439394M001_142211080101_GL_00.jpg
- String[] split = api1109.getWjmc().split(".");
- if (split.length == 2) {
- api1109.setWjmc(split[0] + "_00" + split[1]);
- }
+ api1109.setWjmc(getWjmc(api1109.getWjlx(), api1109.getWjmc()));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1109);
return api1109;
@@ -341,19 +361,24 @@
Api1202 apiData = (Api1202) data;
BeanUtils.copyProperties(apiData, api1202);
api1202.setBjw(ShAreaBjw.getBjw(code));
- api1202.setPch(apiData.getHwdm() + apiData.getShnd());
api1202.setJzrq(apiData.getCmsj());
if (StringUtils.isEmpty(api1202.getCddm())) {
api1202.setCddm(api1202.getHwdm().substring(2, 8));
}
- if (StringUtils.isEmpty(api1202.getHth())) {
- api1202.setHth("鏃�");
- }
- if (StringUtils.isEmpty(api1202.getJhmxh())) {
- api1202.setJhmxh("璁″垝鏄庣粏鍙�");
- }
if (StringUtils.isEmpty(api1202.getRkjsdh())) {
api1202.setRkjsdh("0");
+ }
+
+ //璁剧疆绮杞崲骞村害
+ List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
+ 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) {
+ api1202.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
}
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
@@ -364,9 +389,6 @@
Api1203 apiData = (Api1203) data;
BeanUtils.copyProperties(apiData, api1203);
api1203.setBjw(ShAreaBjw.getBjw(code));
- //鏌ヨ鏀惰幏骞翠唤
- List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
- api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
if (StringUtils.isEmpty(api1203.getJyxm())) {
api1203.setJyxm("0");
}
@@ -379,6 +401,12 @@
if (StringUtils.isEmpty(api1203.getZkl())) {
api1203.setZkl("0");
}
+ //璁剧疆鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1203.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1203.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
return api1203;
@@ -388,7 +416,23 @@
Api1204 apiData = (Api1204) data;
BeanUtils.copyProperties(apiData, api1204);
api1204.setBjw(ShAreaBjw.getBjw(code));
- api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));
+
+ //璁剧疆鎵规鍙�
+ if (StringUtils.isNotEmpty(api1204.getHth())) {
+ List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
+ if (null != api1202List && api1202List.size() > 0) {
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1202List.get(0).getHwdm());
+ 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());
+ }
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1204);
@@ -400,20 +444,27 @@
Api1205 apiData = (Api1205) data;
BeanUtils.copyProperties(apiData, api1205);
api1205.setBjw(ShAreaBjw.getBjw(code));
- api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
+
api1205.setJzrq(apiData.getCmsj());
if (StringUtils.isEmpty(api1205.getCddm())) {
api1205.setCddm(api1205.getHwdm().substring(2, 8));
}
- if (StringUtils.isEmpty(api1205.getHth())) {
- api1205.setHth("鏃�");
- }
- if (StringUtils.isEmpty(api1205.getJhmxh())) {
- api1205.setJhmxh("璁″垝鏄庣粏鍙�");
- }
if (StringUtils.isEmpty(api1205.getCkjsdh())) {
api1205.setCkjsdh("0");
}
+
+ //璁剧疆绮杞崲骞村害
+ List<Api1404> api1404List = api1404Rep.getDataByJhmxdh(apiData.getJhmxh());
+ 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) {
+ api1205.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -423,14 +474,22 @@
Api1206 apiData = (Api1206) data;
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
- List<Api1205> api1205List = api1205Rep.getDataById(apiData.getCkjsdh());
- api1206.setPch(api1205List.get(0).getHwdm() + DateFormatUtils.format(api1205List.get(0).getCmsj(), "yyyy"));
-
+ //鎵规鍙�
+ if (StringUtils.isNotEmpty(api1206.getHth())) {
+ List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
+ if (null != api1205List && api1205List.size() > 0) {
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1205List.get(0).getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1206.setPch(api1208List.get(0).getHwdm() + api1208List.get(0).getShnd());
+ }
+ }
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1206);
return api1206;
}
if (SH2023Constant.SH_2023_API_CODE_1207.equals(inteId)) {
+ //鍊掍粨鍊掑嚭
SH2023Api1207 api1207 = new SH2023Api1207();
Api1207 apiData = (Api1207) data;
BeanUtils.copyProperties(apiData, api1207);
@@ -438,8 +497,10 @@
api1207.setDcrq(apiData.getDcrq());
api1207.setBjw(ShAreaBjw.getBjw(code));
- api1207.setPch(apiData.getDchwdm() + DateFormatUtils.format(apiData.getDcrq(), "yyyy"));
- api1207.setKddh(apiData.getDcdh().substring(21, 33));
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1207.setPch(api1207.getDchwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1207);
@@ -452,6 +513,7 @@
api1208.setZglkdm(api1208.getHwdm().substring(0, 21));
api1208.setBjw(ShAreaBjw.getBjw(code));
+ //璁剧疆鎵规鍙�
api1208.setPch(apiData.getHwdm() + apiData.getShnd());
if (StringUtils.isEmpty(api1208.getCd())) {
api1208.setCd(api1208.getHwdm().substring(2, 8));
@@ -471,7 +533,10 @@
api1209.setZrshde(apiData.getQzzrshde());
api1209.setBjw(ShAreaBjw.getBjw(code));
api1209.setJzrq(apiData.getYwrq());
- api1209.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyy"));
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1209.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1209);
@@ -483,7 +548,10 @@
BeanUtils.copyProperties(apiData, api1210);
api1210.setBjw(ShAreaBjw.getBjw(code));
- api1210.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getHzrq(), "yyyy"));
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1210);
@@ -497,7 +565,10 @@
api1211.setZglkdm(api1211.getKqdm());
api1211.setBjw(ShAreaBjw.getBjw(code));
api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
- api1211.setZglkdm(apiData.getKqdm());
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1211.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1211);
@@ -526,12 +597,14 @@
Api1302 apiData = (Api1302) data;
BeanUtils.copyProperties(apiData, api1302);
api1302.setBjw(ShAreaBjw.getBjw(code));
- api1302.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
- api1302.setCpjw(String.valueOf(apiData.getLspjw()));
- api1302.setCzgw(String.valueOf(apiData.getLspjw()));
- api1302.setCzdw(String.valueOf(apiData.getLspjw()));
- api1302.setGfwjw(String.valueOf(apiData.getLspjw()));
- api1302.setLwmx(apiData.getLswdzjh());
+ api1302.setLqjs("1");
+ //鎵规鍙�
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1302.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
+ //缁熻灞傞珮銆佸眰浣庛�佸眰鍧囨俯绛変俊鎭�
+ api1302 = packageData1302(api1302);
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1302);
@@ -542,8 +615,10 @@
Api1303 apiData = (Api1303) data;
BeanUtils.copyProperties(apiData, api1303);
api1303.setBjw(ShAreaBjw.getBjw(code));
- api1303.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
-
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1303);
return api1303;
@@ -553,7 +628,10 @@
Api1304 apiData = (Api1304) data;
BeanUtils.copyProperties(apiData, api1304);
api1304.setBjw(ShAreaBjw.getBjw(code));
- api1304.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJcsj(), "yyyy"));
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1304);
@@ -597,8 +675,6 @@
BeanUtils.copyProperties(apiData, api1307);
api1307.setBjw(ShAreaBjw.getBjw(code));
api1307.setAjdm(apiData.getHwdm().substring(0, 28));
- List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
- api1307.setTxbh(api1109List.get(0).getWjmc());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1307);
@@ -610,9 +686,6 @@
BeanUtils.copyProperties(apiData, api1308);
api1308.setBjw(ShAreaBjw.getBjw(code));
- List<Api1109> api1109List = api1109Rep.getDataByFileId(apiData.getFileStorageId());
- api1308.setTxbh(api1109List.get(0).getWjmc());
- api1308.setSpbh(api1109List.get(0).getWjmc());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1308);
@@ -632,6 +705,7 @@
BeanUtils.copyProperties(apiData, api1310);
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
+
if (StringUtils.isEmpty(api1310.getJyxm())) {
api1310.setJyxm("0");
}
@@ -639,25 +713,30 @@
api1310.setJyxmz("0");
}
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();
}
}
+ //璁剧疆鎵规鍙�
+ 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("瀹℃牳浜�");
}
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1310);
return api1310;
@@ -693,8 +772,10 @@
SH2023Api1403 api1403 = new SH2023Api1403();
Api1403 apiData = (Api1403) data;
BeanUtils.copyProperties(apiData, api1403);
- api1403.setJhzxdw(apiData.getJhxddw());
- api1403.setJhzxdwmc(apiData.getJhxddwmc());
+ List<Api1101> api1101List = api1101Rep.findDataByDwdm(apiData.getLhjhdh().substring(0, 18));
+
+ api1403.setJhzxdw(api1101List.get(0).getDwdm());
+ api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -717,9 +798,15 @@
return data;
}
if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
+ SH2023Api2102 apiData = new SH2023Api2102();
+ BeanUtils.copyProperties(data, apiData);
+ List<Api1208> api1208List = api1208Rep.findDataByHwdm(apiData.getDrhwdm());
+ if (null != api1208List && api1208List.size() > 0) {
+ apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
- changeObject(data);
- return data;
+ changeObject(apiData);
+ return apiData;
}
if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
SH2023Api2103 apiData = new SH2023Api2103();
@@ -750,6 +837,126 @@
}
/**
+ * 鏍规嵁涓婃捣鏁版嵁鏍煎紡杩涜灏佽
+ * 灞傚潎娓╋細
+ * 灞傞珮娓╋細
+ * 灞備綆娓╋細
+ * 鍚勮寖鍥村潎娓╋細
+ * 绮俯鏄庣粏锛�
+ * 绮俯鐘舵�侊細
+ * 寮傚父鐐逛釜鏁帮細
+ *
+ * @param data
+ * @return
+ */
+ private SH2023Api1302 packageData1302(SH2023Api1302 data) {
+ if (StringUtils.isEmpty(data.getLswdzjh())) {
+ return data;
+ }
+ String lswdzjh = data.getLswdzjh();
+ String[] split = lswdzjh.split("\\|");
+ Map<Integer, List<Double>> map = new HashMap<>();
+ Integer ceng;
+ Integer errorNum = 0; //寮傚父鐐逛釜鏁�
+ String lwmx = ""; //绮俯鏄庣粏
+ String lwzt = "0"; //绮俯鐘舵��
+ String gfwjw = ""; //鍚勮寖鍥村潎娓�
+ for (String s : split) {
+ String[] grain = s.split(",");
+ ceng = Integer.valueOf(grain[1]);
+ if (null == map.get(ceng)) {
+ map.put(ceng, new ArrayList<>());
+ }
+ map.get(ceng).add(Double.valueOf(grain[0]));
+ lwmx += grain[1] + ":" + grain[2] + ":" + grain[3] + "$" + grain[0];
+ if (Double.valueOf(grain[0]) <= -100) {
+ lwmx += "$" + "1" + "#";
+ errorNum++;
+ } else {
+ lwmx += "$" + "5" + "#";
+ }
+ }
+ String cpjw = ""; //灞傚钩鍧囨俯
+ String czgw = ""; //灞傛渶楂樻俯
+ String czdw = ""; //灞傛渶浣庢俯
+
+ List<Double> payPoints;
+ Double sum;
+ int num;
+ Double tempH;
+ Double tempL;
+ Double tempA;
+ Double tempValue1 = 0.0; //鑼冨洿鍧囨俯1
+ Double tempValue2 = 0.0; //鑼冨洿鍧囨俯2
+ Double tempValue3 = 0.0; //鑼冨洿鍧囨俯3
+ Integer numValue = 0; //璁＄畻鑼冨洿鍧囨俯
+ for (Integer cengNum : map.keySet()) {
+ payPoints = map.get(cengNum);
+ sum = 0.0;
+ num = 0;
+ tempH = null;
+ tempL = null;
+ tempA = 0.0;
+ for (Double point : payPoints) {
+ if(point > -100){
+ sum += point;
+ num++;
+ if (tempH == null) {
+ tempH = point;
+ }
+ if (tempL == null) {
+ tempL = point;
+ }
+ if (tempH < point) {
+ tempH = point;
+ }
+ if (tempL > point) {
+ tempL = point;
+ }
+ }
+ }
+ if (num > 0) {
+ tempA = sum / num;
+ }
+ cpjw += cengNum + "$" + NumberUtil.keepPrecision(tempA, 1) + "#";
+ czgw += cengNum + "$" + tempH + "#";
+ czdw += cengNum + "$" + tempL + "#";
+ //鑼冨洿鍧囨俯灏佽
+ if (cengNum == 1) {
+ tempValue1 = NumberUtil.keepPrecision(tempA, 1);
+ } else if (cengNum == map.keySet().size()) {
+ tempValue3 = NumberUtil.keepPrecision(tempA, 1);
+ } else {
+ tempValue2 += tempA;
+ numValue++;
+ }
+ }
+
+ if (errorNum > 0) {
+ lwzt = "2";
+ }
+ if (numValue > 0) {
+ tempValue2 = NumberUtil.keepPrecision(tempValue2 / numValue, 1);
+ }
+ gfwjw += tempValue1 + "#";
+ if (map.keySet().size() == 2) {
+ gfwjw += tempValue3 + "#";
+ }
+ if (map.keySet().size() > 3) {
+ gfwjw += tempValue2 + "#" + tempValue3 + "#";
+ }
+ data.setCpjw(cpjw);
+ data.setCzgw(czgw);
+ data.setCzdw(czdw);
+ data.setGfwjw(gfwjw);
+ data.setLwmx(lwmx);
+ data.setLwzt(lwzt);
+ data.setYcdgs(errorNum);
+
+ return data;
+ }
+
+ /**
* 鑾峰彇璐㈠姟鏁版嵁json
*
* @param inteId
@@ -767,28 +974,7 @@
}
}
- /**
- * Object绫诲瀷杞彉涓篖ist
- *
- * @param obj
- * @param clazz
- * @param <T>
- * @return
- */
- public static <T> List<T> castList(Object obj, Class<T> clazz) {
- List<T> result = new ArrayList<T>();
- if (obj instanceof List<?>) {
- for (Object o : (List<?>) obj) {
- result.add(clazz.cast(o));
- }
- return result;
- }
- return null;
- }
-
-
- private List<SHFinanceDto> copyApi1503(Api1503 data) {
- Api1503 api1503 = data;
+ private List<SHFinanceDto> copyApi1503(Api1503 api1503) {
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1503.getDwdm());
@@ -838,8 +1024,7 @@
return list;
}
- private List<SHFinanceDto> copyApi1502(Api1502 data) {
- Api1502 api1502 = data;
+ private List<SHFinanceDto> copyApi1502(Api1502 api1502) {
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1502.getDwdm());
@@ -891,8 +1076,7 @@
return list;
}
- private List<SHFinanceDto> copyApi1501(Api1501 data) {
- Api1501 api1501 = data;
+ private List<SHFinanceDto> copyApi1501(Api1501 api1501) {
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1501.getDwdm());
@@ -989,6 +1173,18 @@
list.add(shFinanceDto);
}
+ 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")) {
+ wjmc = wjmc.replaceAll(".png", "_00.png");
+ }
+ }
+ return wjmc;
+ }
+
private Object changeObject(Object object) {
// 浣跨敤鍙嶅皠鑾峰彇灞炴�у垪琛� vo涓哄疄浣撳璞″悕
Field[] fields = object.getClass().getDeclaredFields();
--
Gitblit v1.9.3