From 801a3494543eb2f3d93948b93f737d88137f03a8 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Sat, 21 Aug 2021 10:37:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=AF=BB=E5=8D=A1=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PersonTestingController.java | 12 +++++++++ .../epidemic/entity/PersonTestingEntity.java | 5 ++++ .../epidemic/excel/PersonTestingExcel.java | 9 ++++--- .../epidemic/feign/OssFeignClient.java | 4 +++ .../fallback/OssFeignClientFallback.java | 6 +++++ .../service/PersonTestingService.java | 10 ++++++++ .../impl/PersonTestingServiceImpl.java | 25 +++++++++++++++++++ 7 files changed, 67 insertions(+), 4 deletions(-) diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java index 6fbdbce..a5e3869 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/controller/PersonTestingController.java +++ b/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); + } + } \ No newline at end of file diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java index 40b366c..7052afe 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/entity/PersonTestingEntity.java +++ b/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; + /** * 住址 */ diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/PersonTestingExcel.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/PersonTestingExcel.java index bf588d4..32d9a84 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/excel/PersonTestingExcel.java +++ b/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; diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/feign/OssFeignClient.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/feign/OssFeignClient.java index ea67873..4f71cd7 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/feign/OssFeignClient.java +++ b/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 uploadFile(UploadToOssDTO dto); + @PostMapping(value = "oss/file/uploadBase64", consumes = MediaType.APPLICATION_JSON_VALUE) + Result uploadBase64(UploadFormDTO dto); + } diff --git a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/feign/fallback/OssFeignClientFallback.java b/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/feign/fallback/OssFeignClientFallback.java index ac7f877..e7f59a1 100644 --- a/epdc-cloud-custom/src/main/java/com/elink/esua/epdc/modules/epidemic/feign/fallback/OssFeignClientFallback.java +++ b/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 uploadBase64(UploadFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_OSS_SERVER, "uploadBase64", 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 fa23e27..af8d294 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 @@ -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 { * @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); } \ No newline at end of file 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 28f9c07..fd2ed33 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 @@ -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 page(Map params) { // IPage page = baseDao.selectPage( @@ -142,4 +149,22 @@ public class PersonTestingServiceImpl extends BaseServiceImpl 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("录入成功"); + } + } \ No newline at end of file