优化下

3 years ago · 32d383951f
2 changed files with 30 additions and 35 deletions
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java
@ -13,6 +13,8 @@ import org.springframework.http.MediaType;
 public interface StrConstant {

    String UTF_8 = CharEncoding.UTF_8;
+    String HTTP_STATUS_OK = "200";
+    String HTTP_RESP_CODE = "code";

    String ISO_8859_1 = CharEncoding.ISO_8859_1;

--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java
@ -2,6 +2,7 @@ package com.epmet.commons.tools.utils;

 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.YtDataSyncResDTO;
 import com.epmet.commons.tools.dto.result.YtHscyResDTO;
 import com.epmet.commons.tools.dto.result.YtHsjcResDTO;
@ -19,14 +20,10 @@ import java.util.Map;
@Slf4j
 public class YtHsResUtils {
    private static String SERVER_URL = "http://10.2.2.60:8191/sjzt/server/";
-    private static final String APP_KEY_VALUE = "DR4jF5Be7sCsqDmCamq2tmYCl";
    private static final String APP_KEY = "appkey";
    private static final String CARD_NO = "card_no";
-    private static final String USER_NAME = "name";
    private static final String ROW_NUM = "ROWNUM";
    private static final String PAGE_SIZE = "PAGESIZE";
-    private static final String START = "ROWNUM";
-    private static final String LIMIT = "PAGESIZE";

    /**
     * desc:核酸采样查询
@ -42,12 +39,18 @@ public class YtHsResUtils {
            param.put(PAGE_SIZE, pageSize);
            log.info("hscy api param:{}", param);

-            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hscyxxcx", param);
+            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hscyxxcx", param);
            //String mockData = "{\"id\":\"1570924677539635484\",\"name\":\"杨XX\",\"card_type\":\"1\",\"card_no\":\"370283199912010302\",\"create_by\":\"370613594\",\"create_time\":\"2022-09-17 07:15:22\",\"sys_org_code\":\"370613\",\"sample_tube\":\"GCJ-0825-0441\",\"package_id\":\"bcj00208083952\",\"city\":\"烟台市\",\"uuid\":\"6225684525062602095\",\"county\":\"莱山区\",\"depart_ids\":\"未填写\",\"depart_name\":null,\"realname\":\"采样点327\",\"upload_time\":\"2022-09-17 07:56:45\",\"sd_id\":null,\"sd_batch\":null,\"sd_operation\":null,\"sd_time\":null,\"inserttime\":\"2022-09-17 09:36:20\"}";
            //Result<String> result = new Result<String>().ok(mockData);
            log.info("hscy api result:{}", JSON.toJSONString(result));
            if (result.success()) {
+                String data = result.getData();
+                JSONObject jsonObject = JSON.parseObject(data);
+                if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) {
                    return JSON.parseObject(result.getData(), YtHscyResDTO.class);
+                } else {
+                    log.warn("hscy 调用蓝图接口败");
+                }
            }
        } catch (Exception e) {
            log.error(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage()));
@ -64,20 +67,25 @@ public class YtHsResUtils {
     */
    public static YtHsjcResDTO hsjc(String cardNo, Integer rowNum, Integer pageSize) {
        try {
-            //String param = String.format("&card_no=%s&ROWNUM=%s&PAGESIZE=%s", cardNo, rowNum, pageSize);
-            //String apiUrl = url.concat(param);
            Map<String, Object> param = new HashMap<>();
            param.put(APP_KEY, "DR4jF5Be7sCsqDmCamq2tmYCl");
            param.put(CARD_NO, cardNo);
            param.put(ROW_NUM, rowNum);
            param.put(PAGE_SIZE, pageSize);
            log.info("hsjc api param:{}", param);
-            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL+"hsjcxx", param);
+            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "hsjcxx", param);
 //            String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":[{\"id\":\"6a31eb2d38c011eda054fa163ebc7ff4\",\"name\":\"数据同步测试用户\",\"card_no\":\"370283199912010302\",\"telephone\":\"13697890860\",\"address\":\"保利香榭里公馆18-1-302\",\"test_time\":\"2022-09-20 12:52:28\",\"depart_name\":\"天仁医学检验实验室有限公司\",\"county\":\"莱山区\",\"upload_time\":\"2022-09-20 21:23:10\",\"sample_result_pcr\":\"2\",\"sample_time\":\"2022-09-20 06:48:28\",\"sampling_org_pcr\":\"采样点327\"}],\"total\":1}";
 //            Result<String> result = new Result<String>().ok(mockData);
            log.info("hsjc api result:{}", JSON.toJSONString(result));
            if (result.success()) {
+                String data = result.getData();
+                JSONObject jsonObject = JSON.parseObject(data);
+                if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) {
                    return JSON.parseObject(result.getData(), YtHsjcResDTO.class);
+                } else {
+                    log.warn("hsjc 调用蓝图接口败");
+                }
+
            }
        } catch (Exception e) {
            log.error(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage()));
@ -108,19 +116,22 @@ public class YtHsResUtils {

            log.info("siWang api param:{}", param);

-            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL+"mzt_hhrysj1", param);
+            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "mzt_hhrysj1", param);
 //            String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"data\\\\\\\":[{\\\\\\\"AGE\\\\\\\":\\\\\\\"82\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\":\\\\\\\"1933-02-23\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\":\\\\\\\"莱州市殡仪馆\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\":\\\\\\\"2016-01-03 13:01\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600555c2849\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\":\\\\\\\"2016-01-02\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\":\\\\\\\"山东省莱州市光州西路420号\\\\\\\",\\\\\\\"FOLK\\\\\\\":\\\\\\\"01\\\\\\\",\\\\\\\"ID_CARD\\\\\\\":\\\\\\\"370625193302231929\\\\\\\",\\\\\\\"NAME\\\\\\\":\\\\\\\"陈秀芬\\\\\\\",\\\\\\\"NATION\\\\\\\":\\\\\\\"156\\\\\\\",\\\\\\\"POPULACE\\\\\\\":\\\\\\\"3381C300B4B9439FE05319003C0A0897\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\":\\\\\\\"烟台市莱州市文昌路街道\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\":\\\\\\\"8abc809851ffaf1501520600694e2877\\\\\\\",\\\\\\\"RN\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"SEX\\\\\\\":\\\\\\\"2\\\\\\\"}],\\\\\\\"fields\\\\\\\":[\\\\\\\"RN\\\\\\\",\\\\\\\"RECORD_ID\\\\\\\",\\\\\\\"DEAD_ID\\\\\\\",\\\\\\\"NAME\\\\\\\",\\\\\\\"SEX\\\\\\\",\\\\\\\"CARD_TYPE\\\\\\\",\\\\\\\"ID_CARD\\\\\\\",\\\\\\\"BIRTHDAY\\\\\\\",\\\\\\\"AGE\\\\\\\",\\\\\\\"NATION\\\\\\\",\\\\\\\"FOLK\\\\\\\",\\\\\\\"IF_LOCAL\\\\\\\",\\\\\\\"POPULACE\\\\\\\",\\\\\\\"FAMILY_ADD\\\\\\\",\\\\\\\"WORK_NAME\\\\\\\",\\\\\\\"DEATH_DATE\\\\\\\",\\\\\\\"CREMATION_TIME\\\\\\\",\\\\\\\"CREATE_ORGAN_NAME\\\\\\\",\\\\\\\"POPULACE_NAME\\\\\\\"],\\\\\\\"total\\\\\\\":\\\\\\\"1\\\\\\\"}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}";
 //            Result<String> result = new Result<String>().ok(mockData);
            log.info("siWang api result:{}", JSON.toJSONString(result));
+            if (!result.success()) {
+                return new YtDataSyncResDTO();
+            }
            String data = result.getData();
            JSONObject jsonObject = JSON.parseObject(data);
            //他们的结果是成功的
-            if (jsonObject != null && "200".equals(jsonObject.getString("code"))) {
+            if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) {
                //第一层
                JSONObject firstData = JSON.parseObject(jsonObject.getString("data"));

                //第二层 data
-                if (firstData != null && "200".equals(firstData.getString("code"))) {
+                if (firstData != null && StrConstant.HTTP_STATUS_OK.equals(firstData.getString(StrConstant.HTTP_RESP_CODE))) {
                    //第一层
                    JSONObject secondData = JSON.parseObject(firstData.getString("data"));
                    Object thirdData = "";
@ -164,38 +175,20 @@ public class YtHsResUtils {
            log.info("canji api param:{}", param);


-            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL+"sdcl_xxzx_czcjr1", param);
+            Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL + "sdcl_xxzx_czcjr1", param);
 //            String mockData = "{\"code\":\"200\",\"msg\":\"请求成功\",\"data\":\"{\\\"code\\\":200,\\\"data\\\":\\\"{\\\\\\\"result\\\\\\\":true,\\\\\\\"errorcode\\\\\\\":0,\\\\\\\"msg\\\\\\\":\\\\\\\"获取成功\\\\\\\",\\\\\\\"data\\\\\\\":{\\\\\\\"isNewRecord\\\\\\\":true,\\\\\\\"delFlag\\\\\\\":\\\\\\\"0\\\\\\\",\\\\\\\"pageNo\\\\\\\":0,\\\\\\\"pageSize\\\\\\\":0,\\\\\\\"name\\\\\\\":\\\\\\\"数据同步测试用户\\\\\\\",\\\\\\\"genderName\\\\\\\":\\\\\\\"男\\\\\\\",\\\\\\\"citizenId\\\\\\\":\\\\\\\"370682198002072719\\\\\\\",\\\\\\\"cardNum\\\\\\\":\\\\\\\"370283199912010302\\\\\\\",\\\\\\\"idtKindName\\\\\\\":\\\\\\\"精神\\\\\\\",\\\\\\\"idtLevelName\\\\\\\":\\\\\\\"二级\\\\\\\",\\\\\\\"eduLevelName\\\\\\\":\\\\\\\"小学\\\\\\\",\\\\\\\"marriagerName\\\\\\\":\\\\\\\"未婚\\\\\\\",\\\\\\\"guardian\\\\\\\":\\\\\\\"盖希仁\\\\\\\",\\\\\\\"guardianPhone\\\\\\\":\\\\\\\"13854516627\\\\\\\",\\\\\\\"guardianRName\\\\\\\":\\\\\\\"兄/弟/姐/妹\\\\\\\",\\\\\\\"raceName\\\\\\\":\\\\\\\"汉族\\\\\\\",\\\\\\\"certDate\\\\\\\":1620779842000,\\\\\\\"residentAdd\\\\\\\":\\\\\\\"姜疃镇凤头村248号附1号\\\\\\\",\\\\\\\"nowAdd\\\\\\\":\\\\\\\"山东省烟台市莱阳市姜疃镇凤头村委会\\\\\\\",\\\\\\\"phoneNo\\\\\\\":\\\\\\\"13854516627\\\\\\\"}}\\\",\\\"message\\\":\\\"\\\"}\",\"total\":0}";
 //            Result<String> result = new Result<String>().ok(mockData);
            log.info("canji api result:{}", JSON.toJSONString(result));
+
            if (result.success()) {
-                /*返回示例
-                 {
-                    "code":"200",
-                    "msg":"请求成功",
-                    "data":"{
-                        \"code\":200,
-                        \"data\":{
-                            \\\"result\\\":true,
-                            \\\"errorcode\\\":0,
-                            \\\"msg\\\":\\\"获取成功\\\",
-                            \\\"data\\\":{
-                                \\\"isNewRecord\\\":\\\"true\\\",
-                            }
-                        }
-                        \"message\":\"\"
-                    }",
-                    "total":0
-                }
-                */
                String data = result.getData();
                JSONObject jsonObject = JSON.parseObject(data);
                //他们的结果是成功的
-                if (jsonObject != null && "200".equals(jsonObject.getString("code"))) {
+                if (jsonObject != null && StrConstant.HTTP_STATUS_OK.equals(jsonObject.getString(StrConstant.HTTP_RESP_CODE))) {
                    //第一层data
                    JSONObject realObject = JSON.parseObject(jsonObject.getString("data"));

-                    if (realObject != null && "200".equals(realObject.getString("code"))) {
+                    if (realObject != null && StrConstant.HTTP_STATUS_OK.equals(realObject.getString(StrConstant.HTTP_RESP_CODE))) {
                        //第二层 data
                        String thirdData = realObject.getString("data");
                        return JSON.parseObject(thirdData, YtDataSyncResDTO.class);