From 8bb41500250e39badf62ab6b9fd350f2523337d0 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 12 May 2022 16:23:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=A3=80=E6=B5=8B=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2/PersonTestingV2Controller.java         | 27 +++++++++++++++++
 .../epidemic/dao/PersonTestingDao.java        |  9 ++++++
 .../service/PersonTestingService.java         |  9 ++++++
 .../impl/PersonTestingServiceImpl.java        | 29 +++++++++++++++++++
 .../mapper/epidemic/PersonTestingDao.xml      | 10 +++++++
 5 files changed, 84 insertions(+)

diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java
index 6b0dd59..d7f967a 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/v2/PersonTestingV2Controller.java
@@ -48,6 +48,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -196,4 +197,30 @@ public class PersonTestingV2Controller {
         PersonInfoPhoneDTO data = personTestingService.getNameByIDcard(idCard);
         return new Result<PersonInfoPhoneDTO>().ok(data);
     }
+
+
+    /***
+     *  获取姓名
+     * @param idCard
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.PersonTestingDTO>
+     * @author qushutong
+     * @date 2022/4/26 9:43
+     */
+    @GetMapping("html/getNameByIDcard/{idCard}")
+    public Result<PersonInfoPhoneDTO> getNameByIDcardHtml(@PathVariable("idCard") String idCard) {
+        PersonInfoPhoneDTO data = personTestingService.getNameByIDcard(idCard);
+        return new Result<PersonInfoPhoneDTO>().ok(data);
+    }
+
+    /**
+    * @describe: h5录入核酸检测登记
+    * @author wangtong
+    * @date 2022/5/12 10:45
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("html/saveHtmlTestingInfo")
+    public Result saveHtmlTestingInfo(@RequestBody PersonTestingDTO dto) throws ParseException {
+        return personTestingService.saveHtmlTestingInfo(dto);
+    }
 }
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java
index adca5a5..f5bf29c 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/dao/PersonTestingDao.java
@@ -88,4 +88,13 @@ public interface PersonTestingDao extends BaseDao<PersonTestingEntity> {
      * @date 2022/4/26 9:57
      */
     PersonInfoPhoneDTO selectInfoByIdCard(String idCard);
+
+    /**
+    * @describe: 手动插入扫码核酸登记人员
+    * @author wangtong
+    * @date 2022/5/12 15:57
+    * @params [entity]
+    * @return void
+    */
+    void insertHtmlTestingInfo(PersonTestingDTO dto);
 }
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java
index e5d32a5..50e220b 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java
@@ -148,4 +148,13 @@ public interface PersonTestingService extends BaseService<PersonTestingEntity> {
     Result importExcel(MultipartFile file);
 
     PersonInfoPhoneDTO getNameByIDcard(String idCard);
+
+    /**
+    * @describe: h5录入核酸检测登记
+    * @author wangtong
+    * @date 2022/5/12 11:02
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result saveHtmlTestingInfo(PersonTestingDTO dto) throws ParseException;
 }
diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
index be0a586..188dacc 100644
--- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
+++ b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java
@@ -63,6 +63,7 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.net.URLEncoder;
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -511,6 +512,34 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
         return baseDao.selectInfoByIdCard(idCard);
     }
 
+    @Override
+    public Result saveHtmlTestingInfo(PersonTestingDTO dto) throws ParseException {
+        if(StringUtils.isBlank(dto.getCreatedBy()) || StringUtils.isBlank(dto.getCreatedByName())
+                || StringUtils.isBlank(dto.getOrgan()) ){
+            throw new RenException("二维码参数有空值，请联系管理员");
+        }
+        String result = IdentityNoUtils.IdentityNoVerification(dto.getIdcard());
+        if (result != null) {
+            throw new RenException(result);
+        }
+        //检测时间
+        Date date = new Date();
+        dto.setTestingTime(date);
+//        PersonTestingEntity entity = ConvertUtils.sourceToTarget(dto, PersonTestingEntity.class);
+        dto.setSex("0" == IdentityNoUtils.getSex(dto.getIdcard())?"女":"男");
+        DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+        dto.setBirthday(format.parse(IdentityNoUtils.getBirthday(dto.getIdcard())));
+        dto.setCreatedByName(dto.getCreatedByName());
+        dto.setOrgan(dto.getOrgan());
+        dto.setCreatedBy(dto.getCreatedBy());
+        dto.setCreatedTime(date);
+        dto.setUpdatedTime(date);
+        dto.setUpdatedBy(dto.getCreatedBy());
+        baseDao.insertHtmlTestingInfo(dto);
+        sendMqMessage(dto);
+        return new Result().ok("录入成功");
+    }
+
     /**
      * 组装异常信息
      *
diff --git a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
index 1d49a25..ed64b9d 100644
--- a/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
+++ b/epdc-cloud-custom/src/main/resources/mapper/epidemic/PersonTestingDao.xml
@@ -180,5 +180,15 @@
             CREATED_TIME DESC
         LIMIT 1
     </select>
+    <insert id="insertHtmlTestingInfo">
+        insert into
+            epdc_person_testing(id,name,sex,BIRTHDAY,MOBILE,IDCARD,ORGAN,TESTING_TIME,
+                                REVISION,CREATED_BY,CREATED_TIME,UPDATED_BY,UPDATED_TIME,
+                                DEL_FLAG,CREATED_BY_NAME)
+        values
+                                (MD5(UUID()),#{name},#{sex},#{birthday},#{mobile},#{idcard},#{organ},#{testingTime},
+                                0,#{createdBy},#{createdTime},#{updatedBy},#{updatedTime},
+                                '0',#{createdByName})
+    </insert>
 
 </mapper>