核酸采样

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/YtHscyResDTO.java

@@ -0,0 +1,80 @@
+package com.epmet.commons.tools.dto.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+/**
+ * @Description 核算采样结果
+ * @Author yzm
+ * @Date 2022/9/26 17:04
+ */
+@NoArgsConstructor
+@Data
+public class YtHscyResDTO {
+    private int code = 200;
+    private String msg = "请求成功";
+    /**
+     * 响应数据
+     */
+    private List<YtHscyResDetail> data;
+    private int total;
+
+    @Data
+    class YtHscyResDetail {
+        private String id;
+        private String name;
+        private String card_type;
+        private String card_no;
+        private String create_by;
+        /**
+         * 采样时间
+         */
+        private String create_time;
+        private String sys_org_code;
+        private String sample_tube;
+        private String package_id;
+        private String city;
+        private String uuid;
+        private String county;
+        private String depart_ids;
+        private Object depart_name;
+        /**
+         * 采样点名称
+         */
+        private String realname;
+        private String upload_time;
+        private Object sd_id;
+        private Object sd_batch;
+        private Object sd_operation;
+        private Object sd_time;
+        private String inserttime;
+    }
+
+    /*{
+                    "id":"1570924677539635484",
+                     "name":"杨XX",//姓名
+                    "card_type":"1",//证件类型
+                    "card_no":"37************0813",//证件号码
+                    "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"//省大数据局返还烟台入库时间
+                }*/
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/YtHsResUtils.java

@@ -3,6 +3,7 @@ package com.epmet.commons.tools.utils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.epmet.commons.tools.dto.result.YtDataSyncResDTO;
+import com.epmet.commons.tools.dto.result.YtHscyResDTO;
 import com.epmet.commons.tools.dto.result.YtHsjcResDTO;
 import lombok.extern.slf4j.Slf4j;
 
@@ -28,7 +29,36 @@ public class YtHsResUtils {
     private static final String LIMIT = "PAGESIZE";
 
     /**
-     * desc:图片同步扫描
+     * desc:核酸采样查询
+     *
+     * @return
+     */
+    public static YtHscyResDTO hscy(String cardNo, Integer rowNum, Integer pageSize) {
+        try {
+            Map<String, Object> param = new HashMap<>();
+            param.put(APP_KEY, APP_KEY_VALUE);
+            param.put(CARD_NO, cardNo);
+            param.put(ROW_NUM, rowNum);
+            param.put(PAGE_SIZE, pageSize);
+            log.info("hscy api param:{}", param);
+            //todo 核酸检测 mock数据 放开她
+            //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()) {
+                return JSON.parseObject(result.getData(), YtHscyResDTO.class);
+            }
+        } catch (Exception e) {
+            log.error(String.format("烟台核酸检测结果查询异常cardNo:%s,异常信息:%s", cardNo, e.getMessage()));
+        }
+        YtHscyResDTO resultResult = new YtHscyResDTO();
+        resultResult.setData(new ArrayList<>());
+        return resultResult;
+    }
+
+    /**
+     * desc:核酸结果查询
      *
      * @return
      */
@@ -81,7 +111,6 @@ public class YtHsResUtils {
 
             //todo 放开他
             //Result<String> result = HttpClientManager.getInstance().sendGet(SERVER_URL+"mzt_hhrysj1", param);
-            String mockData2 = "{\"code\":200,\"data\":\"{\\\"data\\\":[{\\\"AGE\\\":\\\"73\\\",\\\"CARD_TYPE\\\":\\\"9\\\",\\\"CREATE_ORGAN_NAME\\\":\\\"菏泽市巨野县殡仪馆\\\",\\\"CREMATION_TIME\\\":\\\"2014-04-17 14:46\\\",\\\"DEAD_ID\\\":\\\"SZ-371724-2012-1006560\\\",\\\"DEATH_DATE\\\":\\\"2014-04-17\\\",\\\"FAMILY_ADD\\\":\\\"菏泽市巨野县开发区马庄村\\\",\\\"FOLK\\\":\\\"01\\\",\\\"ID_CARD\\\":\\\"1\\\",\\\"NAME\\\":\\\"郭**\\\",\\\"NATION\\\":\\\"156\\\",\\\"POPULACE\\\":\\\"3381C3014B60439FE05319003C0A0897\\\",\\\"POPULACE_NAME\\\":\\\"菏泽市巨野县开发区马庄村\\\",\\\"RECORD_ID\\\":\\\"E-371724-2012-100000000000407849\\\",\\\"RN\\\":\\\"1\\\",\\\"SEX\\\":\\\"1\\\"}],\\\"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\\\":\\\"4903\\\"}\",\"message\":\"\"}";
             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));