检验结果添加注解

thyy-scheduled/src/main/java/org/thyy/scheduled/config/RestTemplateConfig.java

@@ -1,20 +0,0 @@
-package org.thyy.scheduled.config;
-
-import org.springframework.boot.web.client.RestTemplateBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.client.RestTemplate;
-
-import java.time.Duration;
-
-@Configuration
-public class RestTemplateConfig {
-
-    @Bean
-    public RestTemplate restTemplate(RestTemplateBuilder builder) {
-        return builder
-                .connectTimeout(Duration.ofSeconds(3))
-                .readTimeout(Duration.ofSeconds(5))
-                .build();
-    }
-}

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/InspectionController.java

@@ -1,22 +1,18 @@
 package org.thyy.thirdpartapi.inspection;
 
 import com.alibaba.fastjson2.JSONObject;
-import jakarta.annotation.PostConstruct;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.thyy.thirdpartapi.inspection.config.InspectionApi;
 import org.thyy.thirdpartapi.inspection.response.jy.JyDetailResponse;
 import org.thyy.thirdpartapi.inspection.response.jy.JyIndexResponse;
 import org.thyy.utils.result.R;
 import org.thyy.utils.result.ResultVo;
 
 import java.util.List;
-import java.util.Map;
 
 @RestController
 @RequestMapping("/inspection")

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/InspectionInterface.java

@@ -1,7 +1,6 @@
 package org.thyy.thirdpartapi.inspection;
 
 import com.alibaba.fastjson2.JSONObject;
-import org.thyy.thirdpartapi.inspection.config.InspectionApi;
 import org.thyy.thirdpartapi.inspection.response.jy.JyDetailResponse;
 import org.thyy.thirdpartapi.inspection.response.jy.JyIndexResponse;
 

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/inspectionImpl/ThyyInspectionImpl.java

@@ -1,5 +1,6 @@
 package org.thyy.thirdpartapi.inspection.inspectionImpl;
 
+import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import lombok.extern.slf4j.Slf4j;
@@ -9,8 +10,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.client.RestTemplate;
 import org.thyy.thirdpartapi.inspection.InspectionInterface;
 import org.thyy.thirdpartapi.inspection.config.InspectionApi;
-import org.thyy.thirdpartapi.inspection.response.jy.JyDetailResponse;
-import org.thyy.thirdpartapi.inspection.response.jy.JyIndexResponse;
+import org.thyy.thirdpartapi.inspection.response.jy.*;
 import org.thyy.utils.exception.BizException;
 import org.thyy.utils.exception.ExceptionEnum;
 
@@ -48,15 +48,8 @@ public class ThyyInspectionImpl implements InspectionInterface {
             throw new BizException(ExceptionEnum.API_ERROR, response.getString("message"));
         }
         JSONObject data = response.getJSONObject("data");
-        JSONArray items = data.getJSONArray("items");
-        List<JyIndexResponse> examIndexList = new ArrayList<>();
-        for (int i = 0; i < items.size(); i++) {
-            JSONObject item = items.getJSONObject(i);
-            String jsonString = item.toJSONString();
-            JyIndexResponse examIndexResponse = JSONObject.parseObject(jsonString, JyIndexResponse.class);
-            examIndexList.add(examIndexResponse);
-        }
-        return examIndexList;
+        String items = JSON.toJSONString(data.getJSONArray("items"));
+        return JSON.parseArray(items, JyIndexResponse.class);
     }
 
     @Override
@@ -70,7 +63,16 @@ public class ThyyInspectionImpl implements InspectionInterface {
         if (null == code || !code) {
             throw new BizException(ExceptionEnum.API_ERROR, response.getString("message"));
         }
-        String data = response.getJSONObject("data").toJSONString();
-        return JSONObject.parseObject(data, JyDetailResponse.class);
+        JSONObject data = response.getJSONObject("data");
+//        JSONObject order = data.getJSONObject("order");
+//        JSONArray itmes = order.getJSONArray("items");
+//        JSONArray bacterias = order.getJSONArray("bacterias");
+//
+
+        JyDetailResponse jyR = JSON.parseObject(JSON.toJSONString(data), JyDetailResponse.class);
+//        jyR.setOrder(JSON.to(JyDetailOrder.class, order));
+//        jyR.setItems(JSONArray.parseArray(JSON.toJSONString(itmes), JyDetailItem.class));
+//        jyR.setBacterias(JSON.parseArray(JSON.toJSONString(bacterias), JyDetailBacterias.class));
+        return jyR;
     }
 }

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/response/jy/AntibioticItem.java

@@ -1,14 +1,22 @@
 package org.thyy.thirdpartapi.inspection.response.jy;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 @Data
 public class AntibioticItem {
+    @JSONField(name = "anti_id")
     private Integer antiId;
+    @JSONField(name = "anti_name_uk")
     private String antiNameUk;
+    @JSONField(name = "anti_name_cn")
     private String antiNameCn;
+    @JSONField(name = "anti_abb")
     private String antiAbb;
+    @JSONField(name = "anti_mic")
     private String antiMic;
+    @JSONField(name = "anti_value")
     private String antiValue;
+    @JSONField(name = "anti_str")
     private String antiStr;
 }

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/response/jy/JyDetailBacterias.java

@@ -1,22 +1,35 @@
 package org.thyy.thirdpartapi.inspection.response.jy;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 import java.util.List;
 
 @Data
 public class JyDetailBacterias {
+    @JSONField(name = "itm_id")
     private Integer itmId;
+    @JSONField(name = "itm_code")
     private String itmCode;
+    @JSONField(name = "itm_name")
     private String itmName;
+    @JSONField(name = "itm_ordr")
     private Integer itmOrdr;
+    @JSONField(name = "rslt_strs")
     private String rsltStrs;
+    @JSONField(name = "bac_id")
     private Integer bacId;
+    @JSONField(name = "bac_name_uk")
     private String bacNameUk;
+    @JSONField(name = "bac_name_cn")
     private String bacNameCn;
+    @JSONField(name = "bac_abb")
     private String bacAbb;
+    @JSONField(name = "iden_no")
     private String idenNo;
+    @JSONField(name = "itm_calg")
     private Integer itmCalg;
+    @JSONField(name = "test_mthd")
     private Integer testMthd;
     private List<AntibioticItem> antiList;
 }

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/response/jy/JyDetailItem.java

@@ -1,48 +1,90 @@
 package org.thyy.thirdpartapi.inspection.response.jy;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 @Data
 public class JyDetailItem {
+    @JSONField(name = "itm_id")
     private Integer itmId;
+    @JSONField(name = "itm_code")
     private String itmCode;
+    @JSONField(name = "itm_name")
     private String itmName;
+    @JSONField(name = "itm_unit")
     private String itmUnit;
+    @JSONField(name = "itm_ordr")
     private Integer itmOrdr;
+    @JSONField(name = "itm_value")
     private String itmValue;
+    @JSONField(name = "itm_src_value")
     private String itmSrcValue;
+    @JSONField(name = "rslt_list_id")
     private Integer rsltListId;
+    @JSONField(name = "rslt_id")
     private Integer rsltId;
+    @JSONField(name = "rslt_strs")
     private String rsltStrs;
+    @JSONField(name = "itm_str_value")
     private String itmStrValue;
+    @JSONField(name = "itm_str_src_value")
     private String itmStrSrcValue;
+    @JSONField(name = "res_type")
     private Integer resType;
+    @JSONField(name = "item_src_flow_id")
     private Long itemSrcFlowId;
+    @JSONField(name = "defl_rslt_id")
     private Integer deflRsltId;
+    @JSONField(name = "rslt_name")
     private String rsltName;
+    @JSONField(name = "range_low")
     private String rangeLow;
+    @JSONField(name = "range_high")
     private String rangeHigh;
+    @JSONField(name = "range")
     private String range;
+    @JSONField(name = "range_rslt_id")
     private Integer rangeRsltId;
+    @JSONField(name = "ran_ge_str")
     private String ranGeStr;
+    @JSONField(name = "itm_alert")
     private String itmAlert;
+    @JSONField(name = "critical_low")
     private String criticalLow;
+    @JSONField(name = "critical_high")
     private String criticalHigh;
+    @JSONField(name = "critical")
     private String critical;
+    @JSONField(name = "critical_alert")
     private String criticalAlert;
+    @JSONField(name = "calc_type")
     private Integer calcType;
+    @JSONField(name = "calc_fomula")
     private String calcFomula;
+    @JSONField(name = "calc_fomula_items")
     private String calcFomulaItems;
+    @JSONField(name = "dec_bit")
     private Integer decBit;
+    @JSONField(name = "is_null")
     private Integer isNull;
+    @JSONField(name = "is_num")
     private Integer isNum;
+    @JSONField(name = "prnt_grup")
     private Integer prntGrup;
+    @JSONField(name = "other_flag_a")
     private Integer otherFlagA;
+    @JSONField(name = "other_flag_b")
     private Integer otherFlagB;
+    @JSONField(name = "other_flag_c")
     private Integer otherFlagC;
+    @JSONField(name = "mthd_name")
     private String mthdName;
+    @JSONField(name = "critical_exec_flag")
     private Integer criticalExecFlag;
+    @JSONField(name = "critical_exec_info")
     private String criticalExecInfo;
+    @JSONField(name = "critical_exec_time")
     private String criticalExecTime;
+    @JSONField(name = "map_pis_code")
     private String mapPisCode;
 }

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/inspection/response/jy/JyDetailOrder.java

@@ -1,45 +1,84 @@
 package org.thyy.thirdpartapi.inspection.response.jy;
 
+import com.alibaba.fastjson2.annotation.JSONField;
 import lombok.Data;
 
 @Data
 public class JyDetailOrder {
+    @JSONField(name = "ordr_id")
     private Integer ordrId;
+    @JSONField(name = "aply_date")
     private String aplyDate;
+    @JSONField(name = "ordr_create_date")
     private String ordrCreateDate;
+    @JSONField(name = "inspect_time")
     private String inspectTime;
+    @JSONField(name = "sign_time")
     private String signTime;
+    @JSONField(name = "ordr_date")
     private String ordrDate;
+    @JSONField(name = "audt_time")
     private String audtTime;
+    @JSONField(name = "prnt_status")
     private Integer prntStatus;
+    @JSONField(name = "smpl_num")
     private String smplNum;
+    @JSONField(name = "smpl_name")
     private String smplName;
+    @JSONField(name = "aply_cntn")
     private String aplyCntn;
+    @JSONField(name = "test_usr_id")
     private Integer testUsrId;
+    @JSONField(name = "test_usr_name")
     private String testUsrName;
+    @JSONField(name = "ordr_usr_id")
     private Integer ordrUsrId;
+    @JSONField(name = "ordr_usr_name")
     private String ordrUsrName;
+    @JSONField(name = "audt_usr_id")
     private Integer audtUsrId;
+    @JSONField(name = "audt_usr_name")
     private String audtUsrName;
+    @JSONField(name = "aply_flow_num")
     private String aplyFlowNum;
+    @JSONField(name = "emcy_mrk")
     private Integer emcyMrk;
+    @JSONField(name = "dept_name")
     private String deptName;
+    @JSONField(name = "doc_name")
     private String docName;
+    @JSONField(name = "id_card")
     private String idCard;
+    @JSONField(name = "ic_card")
     private String icCard;
+    @JSONField(name = "ptnt_no")
     private String ptntNo;
+    @JSONField(name = "ptnt_no_type")
     private Integer ptntNoType;
+    @JSONField(name = "ptnt_name")
     private String ptntName;
+    @JSONField(name = "ptnt_sex")
     private Integer ptntSex;
+    @JSONField(name = "ptnt_age_first")
     private String ptntAgeFirst;
+    @JSONField(name = "ptnt_age_second")
     private Integer ptntAgeSecond;
+    @JSONField(name = "ptnt_age")
     private String ptntAge;
+    @JSONField(name = "ptnt_age_unit")
     private Integer ptntAgeUnit;
+    @JSONField(name = "ptnt_bed_no")
     private String ptntBedNo;
+    @JSONField(name = "diag_info")
     private String diagInfo;
+    @JSONField(name = "ctat_addr")
     private String ctatAddr;
+    @JSONField(name = "phone_num")
     private String phoneNum;
+    @JSONField(name = "ordr_remark")
     private String ordrRemark;
+    @JSONField(name = "sqnc_num")
     private Integer sqncNum;
+    @JSONField(name = "dvce_name")
     private String dvceName;
 }

thyy-thirdpart-api/src/main/resources/application.yml

@@ -6,7 +6,6 @@ server:
   servlet:
     context-path: /thyy/thirdpart/api
 
-
 thyy:
   tts:
     service: xfyun
@@ -17,4 +16,4 @@ thyy:
     api-secret: OWZjZGE4NjI3MDdkYzg4ZjllY2VjNGQ0
   inspection:
     jy: http://172.16.32.178/apis/third/report/query
-#    service: shanghaihaotai
+    service: shanghaihaotai

thyy-thirdpart-api/src/main/java/org/thyy/thirdpartapi/RestTemplateConfig.java → thyy-utils/src/main/java/org/thyy/utils/config/RestTemplateConfig.java

@@ -1,4 +1,4 @@
-package org.thyy.thirdpartapi;
+package org.thyy.utils.config;
 
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.context.annotation.Bean;