对接读卡器

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java

@@ -96,6 +96,18 @@ public class PersonTestingController {
         ExcelUtils.exportExcelToTarget(response, null, list, PersonTestingExcel.class);
     }
 
+    /**
+    * @describe: 读卡器录入数据
+    * @author wangtong
+    * @date 2021/8/20 18:11
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    @PostMapping("saveScanningInfo")
+    public Result saveScanningInfo(@RequestBody PersonTestingDTO dto){
+        return personTestingService.saveScanningInfo(dto);
+    }
+
 
 
 }

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java

@@ -58,6 +58,11 @@ public class PersonTestingEntity extends BaseEpdcEntity {
      */
 	private Date birthday;
 
+	/**
+	 * 手机号
+	 */
+	private String mobile;
+
     /**
      * 住址
      */

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/PersonTestingExcel.java

@@ -20,8 +20,6 @@ package com.elink.esua.epdc.modules.epidemic.excel;
 import cn.afterturn.easypoi.excel.annotation.Excel;
 import lombok.Data;
 
-import java.util.Date;
-
 /**
  * 核酸检测记录
  *
@@ -44,7 +42,10 @@ public class PersonTestingExcel {
     private String nation;
 
     @Excel(name = "出生日期")
-    private Date birthday;
+    private String birthday;
+
+    @Excel(name = "手机号")
+    private String mobile;
 
     @Excel(name = "住址")
     private String address;
@@ -65,7 +66,7 @@ public class PersonTestingExcel {
 //    private String testingResult;
 
     @Excel(name = "核酸检测时间")
-    private Date testingTime;
+    private String testingTime;
 
 //    @Excel(name = "乐观锁")
 //    private Integer revision;

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/feign/OssFeignClient.java

@@ -2,6 +2,7 @@ package com.elink.esua.epdc.modules.epidemic.feign;
 
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.modules.epidemic.feign.fallback.OssFeignClientFallback;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -28,4 +29,7 @@ public interface OssFeignClient {
     @PostMapping(value = "oss/file/uploadFile", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<String> uploadFile(UploadToOssDTO dto);
 
+    @PostMapping(value = "oss/file/uploadBase64", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<String> uploadBase64(UploadFormDTO dto);
+
 }

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/feign/fallback/OssFeignClientFallback.java

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.epidemic.feign.fallback;
 import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
 import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.dto.UploadToOssDTO;
 import com.elink.esua.epdc.modules.epidemic.feign.OssFeignClient;
 import org.springframework.stereotype.Component;
@@ -19,4 +20,9 @@ public class OssFeignClientFallback implements OssFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadFile", dto.getFileName());
     }
 
+    @Override
+    public Result<String> uploadBase64(UploadFormDTO dto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadBase64", dto);
+    }
+
 }

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/PersonTestingService.java

@@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.epidemic.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.PersonTestingDTO;
 import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity;
 
@@ -93,4 +94,13 @@ public interface PersonTestingService extends BaseService<PersonTestingEntity> {
      * @date 2021-08-20
      */
     void delete(String[] ids);
+
+    /**
+     * @describe: 读卡器录入数据
+     * @author wangtong
+     * @date 2021/8/20 18:11
+     * @params [dto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    Result saveScanningInfo(PersonTestingDTO dto);
 }

epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/service/impl/PersonTestingServiceImpl.java

@@ -23,9 +23,12 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.PersonTestingDTO;
+import com.elink.esua.epdc.dto.UploadFormDTO;
 import com.elink.esua.epdc.modules.epidemic.dao.PersonTestingDao;
 import com.elink.esua.epdc.modules.epidemic.entity.PersonTestingEntity;
+import com.elink.esua.epdc.modules.epidemic.feign.OssFeignClient;
 import com.elink.esua.epdc.modules.epidemic.redis.PersonTestingRedis;
 import com.elink.esua.epdc.modules.epidemic.service.PersonTestingService;
 import org.apache.commons.lang3.StringUtils;
@@ -36,6 +39,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -51,6 +55,9 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
     @Autowired
     private PersonTestingRedis personTestingRedis;
 
+    @Autowired
+    private OssFeignClient ossFeignClient;
+
     @Override
     public PageData<PersonTestingDTO> page(Map<String, Object> params) {
 //        IPage<PersonTestingEntity> page = baseDao.selectPage(
@@ -142,4 +149,22 @@ public class PersonTestingServiceImpl extends BaseServiceImpl<PersonTestingDao,
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Transactional
+    @Override
+    public Result saveScanningInfo(PersonTestingDTO dto) {
+        UploadFormDTO form = new UploadFormDTO();
+        form.setBase64String(dto.getImgCode());
+        PersonTestingEntity entity = ConvertUtils.sourceToTarget(dto, PersonTestingEntity.class);
+        Result<String> uploadResult = ossFeignClient.uploadBase64(form);
+        if(!uploadResult.success()){
+            return new Result().error("上传图片错误");
+        }
+        if(StringUtils.isNotBlank(uploadResult.getData())){
+            entity.setImgUrl(uploadResult.getData());
+        }
+        entity.setTestingTime(new Date());
+        insert(entity);
+        return new Result().ok("录入成功");
+    }
+
 }