From 76a6e71310e4abc19e5733c02cf35c1eb8b3a727 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 30 十月 2023 20:33:51 +0800
Subject: [PATCH] 优化上海接口批次号
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index b007083..fde8cea 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -270,10 +270,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.getWjmc()));
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1109);
return api1109;
@@ -341,7 +338,6 @@
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));
@@ -355,6 +351,9 @@
if (StringUtils.isEmpty(api1202.getRkjsdh())) {
api1202.setRkjsdh("0");
}
+
+ //璁剧疆鎵规鍙�
+ api1202.setPch(apiData.getHwdm() + apiData.getShnd());
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1202);
return api1202;
@@ -364,9 +363,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 +375,10 @@
if (StringUtils.isEmpty(api1203.getZkl())) {
api1203.setZkl("0");
}
+ //璁剧疆鎵规鍙�
+ List<Api1202> api1202List = api1202Rep.getDataById(apiData.getRkywdh());
+ api1203.setPch(apiData.getHwdm() + api1202List.get(0).getShnd());
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1203);
return api1203;
@@ -388,6 +388,8 @@
Api1204 apiData = (Api1204) data;
BeanUtils.copyProperties(apiData, api1204);
api1204.setBjw(ShAreaBjw.getBjw(code));
+
+ //璁剧疆鎵规鍙�
api1204.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJssj(), "yyyy"));
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -400,7 +402,7 @@
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));
@@ -414,6 +416,9 @@
if (StringUtils.isEmpty(api1205.getCkjsdh())) {
api1205.setCkjsdh("0");
}
+ //璁剧疆鎵规鍙�
+ api1205.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getCmsj(), "yyyy"));
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1205);
return api1205;
@@ -424,6 +429,7 @@
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"));
//璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -452,6 +458,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));
@@ -632,6 +639,7 @@
BeanUtils.copyProperties(apiData, api1310);
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
+
if (StringUtils.isEmpty(api1310.getJyxm())) {
api1310.setJyxm("0");
}
@@ -639,12 +647,16 @@
api1310.setJyxmz("0");
}
String lsxzdm = "122";
+ String pch = apiData.getHwdm() + DateFormatUtils.format(new Date(), "yyyy");
List<Api1208> api1208List = api1208Rep.getDataByHwdm(api1310.getHwdm());
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){
api1310.setYpsl(5.0);
@@ -658,9 +670,19 @@
if(StringUtils.isEmpty(api1310.getShrxm())){
api1310.setShrxm("瀹℃牳浜�");
}
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1310);
return api1310;
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1311.equals(inteId)) {
+ SH2023Api1311 api1311 = new SH2023Api1311();
+ BeanUtils.copyProperties(data, api1311);
+ api1311.setBjw(ShAreaBjw.getBjw(code));
+
+ //璁剧疆绌哄睘鎬т负榛樿鍊�
+ changeObject(api1311);
+ return api1311;
}
if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) {
SH2023Api1401 api1401 = new SH2023Api1401();
@@ -740,6 +762,16 @@
return data;
}
+ private String getWjmc(String wjmc){
+ if(wjmc.endsWith(".jpg")) {
+ wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
+ }
+ if(wjmc.endsWith(".png")) {
+ wjmc = wjmc.replaceAll(".png", "_00.png");
+ }
+ return wjmc;
+ }
+
/**
* 鑾峰彇璐㈠姟鏁版嵁json
*
--
Gitblit v1.9.3