From 0ca17268d24ce333e7a515e5662862aa48ba5c3d Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 13 Jan 2022 16:52:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E6=9B=B4=E6=96=B0=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EpidemicUserInfoController.java | 30 ++++++++++-- .../epidemic/dao/EpidemicUserInfoDao.java | 13 ++++- .../epidemic/dto/SaveEpidemicUserDTO.java | 20 ++++++++ .../service/EpidemicUserInfoService.java | 14 ++++-- .../impl/EpidemicUserInfoServiceImpl.java | 49 +++++++++++++++++-- .../mapper/epidemic/EpidemicUserInfoDao.xml | 9 ++++ 6 files changed, 121 insertions(+), 14 deletions(-) create mode 100644 epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/SaveEpidemicUserDTO.java diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java index d5178ba..df26b1d 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/controller/EpidemicUserInfoController.java @@ -11,12 +11,11 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordDetailDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicReportUserInfoDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO; +import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao; +import com.elink.esua.epdc.vaccine.epidemic.dto.*; import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; +import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; import com.elink.esua.epdc.vaccine.epidemic.excel.EpidecmicUserNewExcel; import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService; import com.elink.esua.epdc.vaccine.epidemic.service.impl.EpidemicUserInfoExportServer; @@ -26,6 +25,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; +import java.util.List; import java.util.Map; @@ -44,6 +44,8 @@ public class EpidemicUserInfoController { @Autowired private EpidemicUserInfoExportServer exportServer; + @Autowired + private EpidemicUserInfoDao epidemicUserInfoDao; @GetMapping("page") public Result> page(@RequestParam Map params) { @@ -152,4 +154,24 @@ public class EpidemicUserInfoController { public Result importExcel(@RequestParam("file") MultipartFile file, String gridId) { return epidemicUserInfoService.importEpidemicUser(file,gridId); } + + /** + * @describe: 接受县平台更新的人员信息并更新/保存 + * @author wangtong + * @date 2022/1/12 15:55 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @PostMapping("updateSyncUser") + public Result updateSyncUser(@RequestBody SaveEpidemicUserDTO dto) { + return epidemicUserInfoService.updateSyncUser(dto); + } + + @PostMapping("updateSyncUserTest") + public Result updateSyncUserTest() { + SaveEpidemicUserDTO dto = new SaveEpidemicUserDTO(); + List list = epidemicUserInfoDao.selectAll(); + dto.setList(list); + return epidemicUserInfoService.updateSyncUser(dto); + } } diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java index 7ad61a8..1b3a7be 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dao/EpidemicUserInfoDao.java @@ -204,4 +204,15 @@ public interface EpidemicUserInfoDao extends BaseDao { * @return java.lang.String */ String getMobileByIdCard(@Param("idcard") String idcard); -} \ No newline at end of file + + List selectAll(); + + /** + * @describe: 更新县平台传送过来的时间和删除标识字段 + * @author wangtong + * @date 2022/1/13 15:52 + * @params [eu] + * @return void + */ + void updateSysInfo(EpidemicUserInfoEntity eu); +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/SaveEpidemicUserDTO.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/SaveEpidemicUserDTO.java new file mode 100644 index 0000000..7252987 --- /dev/null +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/dto/SaveEpidemicUserDTO.java @@ -0,0 +1,20 @@ +package com.elink.esua.epdc.vaccine.epidemic.dto; + +import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: epdc-cloud-custom-yushan + * @description: + * @author: wangtong + * @create: 2022-01-12 15:54 + **/ +@Data +public class SaveEpidemicUserDTO implements Serializable { + + //人员信息 + private List list; +} diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java index 3e6df9a..8216726 100644 --- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java +++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/EpidemicUserInfoService.java @@ -4,10 +4,7 @@ package com.elink.esua.epdc.vaccine.epidemic.service; import com.elink.esua.epdc.commons.mybatis.service.CrudService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordDetailDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicRecordListDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicReportUserInfoDTO; -import com.elink.esua.epdc.vaccine.epidemic.dto.EpidemicUserInfoDTO; +import com.elink.esua.epdc.vaccine.epidemic.dto.*; import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultDTO; import com.elink.esua.epdc.vaccine.epidemic.dto.result.EpidemicPageResultV2DTO; import com.elink.esua.epdc.vaccine.epidemic.dto.result.VaccinationInfoResultDTO; @@ -169,4 +166,13 @@ public interface EpidemicUserInfoService extends CrudService parentAndAllDept = adminVimFeignClient.getParentAndAllDept(deptId); + if (!parentAndAllDept.success() || parentAndAllDept.getData() == null) { + throw new RenException("获取所属组织信息失败"); + } + ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDept.getData(); + entity.setDeptId(parentAndAllDeptDTO.getGridId()); + entity.setDeptName(parentAndAllDeptDTO.getGrid()); + entity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds()); + entity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames()); + entity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds()); + entity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames()); + } + } + /** * 根据数据字典类型，从redis获取简版数据字典列表 * diff --git a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml index c1e21da..8684312 100644 --- a/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml +++ b/epdc-cloud-vim-yushan/src/main/resources/mapper/epidemic/EpidemicUserInfoDao.xml @@ -583,4 +583,13 @@ and ID_CARD=#{idcard} order by CREATED_TIME desc limit 1 + + + update epidemic_user_info + set DEL_FLAG = #{delFlag}, + UPDATED_TIME = #{updatedTime} + where ID_CARD = #{idCard} +