接受更新人员信息

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<PageData<EpidemicRecordListDTO>> page(@RequestParam Map<String, Object> 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<EpidemicUserInfoEntity> list = epidemicUserInfoDao.selectAll();
+        dto.setList(list);
+        return epidemicUserInfoService.updateSyncUser(dto);
+    }
 }

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<EpidemicUserInfoEntity> {
      * @return java.lang.String
      */
     String getMobileByIdCard(@Param("idcard") String idcard);
-}
+
+    List<EpidemicUserInfoEntity> selectAll();
+
+    /**
+    * @describe: 更新县平台传送过来的时间和删除标识字段
+    * @author wangtong
+    * @date 2022/1/13 15:52
+    * @params [eu]
+    * @return void
+    */
+    void updateSysInfo(EpidemicUserInfoEntity eu);
+}

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<EpidemicUserInfoEntity> list;
+}

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<EpidemicUserInfoEnt
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      */
     Result importEpidemicUser(MultipartFile file, String gridId);
+
+    /**
+    * @describe: 接受县平台更新的人员信息并更新/保存
+    * @author wangtong
+    * @date 2022/1/12 15:56
+    * @params [dto]
+    * @return com.elink.esua.epdc.commons.tools.utils.Result
+    */
+    Result updateSyncUser(SaveEpidemicUserDTO dto);
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/epidemic/service/impl/EpidemicUserInfoServiceImpl.java

@@ -27,10 +27,7 @@ import com.elink.esua.epdc.vaccine.constant.ImageConstant;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInfoDao;
 import com.elink.esua.epdc.vaccine.epidemic.dao.EpidemicUserInoutRecordDao;
 import com.elink.esua.epdc.vaccine.epidemic.dao.SelectAreaDao;
-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;
@@ -48,7 +45,6 @@ import com.elink.esua.epdc.vaccine.vim.dto.VaccinationInfoDTO;
 import com.elink.esua.epdc.vaccine.vim.entity.VaccinationInfoEntity;
 import com.elink.esua.epdc.vaccine.vim.service.VaccinationInfoService;
 import com.elink.esua.epdc.vaccine.vim.service.VaccinationUserRoleService;
-import com.elink.esua.epdc.vaccine.vim.service.VimImgService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Workbook;
@@ -748,6 +744,49 @@ public class EpidemicUserInfoServiceImpl extends CrudServiceImpl<EpidemicUserInf
         return new Result();
     }
 
+    @Override
+    public Result updateSyncUser(SaveEpidemicUserDTO dto) {
+        if(null != dto &&  !CollectionUtils.isEmpty(dto.getList())){
+            for(EpidemicUserInfoEntity eu : dto.getList()){
+                EpidemicUserInfoEntity check = epidemicUserInfoService.selectInfoByIdCard(eu.getIdCard());
+                if (null == check) {
+                    setDeptInfo(eu.getDeptId().toString(),eu);
+                    String delFlag = eu.getDelFlag();
+                    Date updatedTime = eu.getUpdatedTime();
+                    insert(eu);
+                    eu.setDelFlag(delFlag);
+                    eu.setUpdatedTime(updatedTime);
+                    baseDao.updateSysInfo(eu);
+                }else{
+                    BeanUtils.copyProperties(eu, check);
+                    //更新部门信息
+                    setDeptInfo(eu.getDeptId().toString(),check);
+                    Date updatedTime = eu.getUpdatedTime();
+                    updateById(check);
+                    check.setUpdatedTime(updatedTime);
+                    baseDao.updateSysInfo(check);
+                }
+            }
+        }
+        return new Result().ok("更新成功！");
+    }
+
+    private void   setDeptInfo(String deptId , EpidemicUserInfoEntity entity){
+        if (StringUtils.isNotBlank(deptId)) {
+            Result<ParentAndAllDeptDTO> 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获取简版数据字典列表
      *

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
     </select>
+    <select id="selectAll" resultType="com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserInfoEntity">
+        select * from epidemic_user_info_copy1
+    </select>
+    <update id="updateSysInfo">
+        update epidemic_user_info
+        set DEL_FLAG = #{delFlag},
+            UPDATED_TIME = #{updatedTime}
+        where ID_CARD = #{idCard}
+    </update>
 </mapper>