From cc0c09e96a829613bcfb4c2cc1ee5ebf998f016c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 15 十一月 2023 18:31:29 +0800
Subject: [PATCH] 宁夏省平台接口调试1

---
 src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java |  269 ++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 230 insertions(+), 39 deletions(-)

diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 2961e6b..6870ad1 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -19,6 +19,7 @@
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+
 import java.lang.reflect.Field;
 import java.util.*;
 
@@ -42,15 +43,23 @@
     @Autowired
     private ApiLogRep apiLogRep;
     @Autowired
+    private Api1101Rep api1101Rep;
+    @Autowired
     private Api1102Rep api1102Rep;
     @Autowired
+    private Api1103Rep api1103Rep;
+    @Autowired
     private Api1104Rep api1104Rep;
+    @Autowired
+    private Api1208Rep api1208Rep;
     @Autowired
     private Api1109Rep api1109Rep;
     @Autowired
     private Api1202Rep api1202Rep;
     @Autowired
     private Api1205Rep api1205Rep;
+    @Autowired
+    private Api1404Rep api1404Rep;
 
     @Override
     public String getProtocol() {
@@ -110,7 +119,7 @@
             //鑾峰彇鎸囦护id
             String key = RedisConst.buildKey(RedisConst.KYE_ORDER, conf.getKqdm());
             OrderData orderData = (OrderData) redisUtil.get(key);
-            if (StringUtils.isEmpty(orderData.getOrderid())) {
+            if (null == orderData || StringUtils.isEmpty(orderData.getOrderid())) {
                 log.error("鎸囦护id澶辨晥=" + jsonData);
                 ResponseDto responseDto = new ResponseDto(99, "鎸囦护id澶辨晥");
                 apiLog.setStatus(99);
@@ -135,7 +144,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());
@@ -154,6 +163,7 @@
 
     /**
      * 杞负JSON
+     *
      * @param inteId
      * @param data
      * @param code
@@ -177,6 +187,7 @@
 
     /**
      * 甯歌鎺ュ彛灏佽
+     *
      * @param inteId
      * @param data
      * @param code
@@ -212,9 +223,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);
@@ -264,7 +291,8 @@
             Map<String, String> map = new HashMap<>();
             map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
             api1109.setWjl(JSON.toJSONString(map));
-
+            //涓婃捣甯傚钩鍙版枃浠跺悕绉拌鍒欙細搴撳尯缂栫爜_涓氬姟娴佹按鍙穇鍒嗙被鐮乢椤哄簭鐮�.jpg锛屼緥濡傦細91310114703439394M001_142211080101_GL_00.jpg
+            api1109.setWjmc(getWjmc(api1109.getWjlx(), api1109.getWjmc()));
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1109);
             return api1109;
@@ -315,7 +343,14 @@
             BeanUtils.copyProperties(data, api1201);
             api1201.setBjw(ShAreaBjw.getBjw(code));
             api1201.setHtsfzz("0");
-
+            //鍚堝悓绛捐鍦扮偣涓嶈兘涓虹┖鎴栧~鏃�
+            if (StringUtils.isEmpty(api1201.getQddd())) {
+                api1201.setQddd("绛捐鍦扮偣");
+            }
+            //鍚堝悓瀹℃牳浜轰笉鑳戒负绌烘垨濉棤
+            if (StringUtils.isEmpty(api1201.getShr())) {
+                api1201.setShr("瀹℃壒浜�");
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1201);
             return api1201;
@@ -325,9 +360,25 @@
             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.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);
             return api1202;
@@ -337,9 +388,24 @@
             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");
+            }
+            if (StringUtils.isEmpty(api1203.getJyz())) {
+                api1203.setJyz("0");
+            }
+            if (StringUtils.isEmpty(api1203.getZkj())) {
+                api1203.setZkj("0");
+            }
+            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;
@@ -349,7 +415,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);
@@ -361,8 +443,26 @@
             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.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);
@@ -373,14 +473,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);
@@ -388,8 +496,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);
@@ -402,8 +512,11 @@
             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));
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1208);
             return api1208;
@@ -419,7 +532,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);
@@ -431,7 +547,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);
@@ -445,7 +564,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);
@@ -474,12 +596,16 @@
             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());
+
+            List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
+            if (null != api1208List && api1208List.size() > 0) {
+                api1302.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
+            }
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1302);
@@ -490,8 +616,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;
@@ -501,7 +629,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);
@@ -513,7 +644,12 @@
             BeanUtils.copyProperties(apiData, api1305);
             api1305.setBjw(ShAreaBjw.getBjw(code));
             api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
-
+            //涓婃捣閫氶浣滀笟鍗曞彿锛氬粧闂翠唬鐮�+yyyyMMdd+3浣嶉『搴忓彿
+            api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
+            api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
+            if (StringUtils.isEmpty(api1305.getTfmd())) {
+                api1305.setTfmd("1"); //闄嶆俯閫氶
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1305);
             return api1305;
@@ -524,8 +660,12 @@
             BeanUtils.copyProperties(apiData, api1306);
             api1306.setBjw(ShAreaBjw.getBjw(code));
             api1306.setPch(apiData.getXzzydh().substring(0, 30) + DateFormatUtils.format(apiData.getXzkssj(), "yyyy"));
-            api1306.setAjdm(apiData.getXzzydh().substring(0, 28));
-
+            api1306.setAjdm(apiData.getHwdm().substring(0, 28));
+            //涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
+            api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
+            if (StringUtils.isEmpty(api1306.getSyff())) {
+                api1306.setSyff("0"); //娼В娉�
+            }
             //璁剧疆绌哄睘鎬т负榛樿鍊�
             changeObject(api1306);
             return api1306;
@@ -536,8 +676,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);
@@ -549,9 +687,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);
@@ -571,14 +706,50 @@
             BeanUtils.copyProperties(apiData, api1310);
             api1310.setBjw(ShAreaBjw.getBjw(code));
             api1310.setJyrq(apiData.getJysj());
-            api1310.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getJysj(), "yyyy"));
-            List<Api1202> api1202List = api1202Rep.getDataByHwdm(apiData.getHwdm());
-            api1310.setLspzdm(api1202List.get(0).getLspzdm());
-            api1310.setLsxzdm("123");
+
+            if (StringUtils.isEmpty(api1310.getJyxm())) {
+                api1310.setJyxm("0");
+            }
+            if (StringUtils.isEmpty(api1310.getJyxmz())) {
+                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())) {
+                    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);
+            }
+            if (StringUtils.isEmpty(api1310.getQyrxm())) {
+                api1310.setQyrxm("鎵︽牱浜�");
+            }
+            if (StringUtils.isEmpty(api1310.getJdrxm())) {
+                api1310.setJdrxm("鐩戠潱浜�");
+            }
+            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();
@@ -602,8 +773,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));
 
             //璁剧疆绌哄睘鎬т负榛樿鍊�
@@ -626,9 +799,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();
@@ -658,6 +837,18 @@
         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")) {
+                wjmc = wjmc.replaceAll(".jpg", "_00.jpg");
+            }
+            if (wjmc.endsWith(".png")) {
+                wjmc = wjmc.replaceAll(".png", "_00.png");
+            }
+        }
+        return wjmc;
+    }
+
     /**
      * 鑾峰彇璐㈠姟鏁版嵁json
      *

--
Gitblit v1.9.3