Merge branch 'master-烟台' into 烟台-政务master

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java

@@ -59,6 +59,22 @@ public class GovMenuController {
 		return new Result();
 	}
 
+	/**
+	 * 疯狂家按钮，我要写个接口批量赠....
+	 * @param formList
+	 * @param tokenDto
+	 * @return
+	 */
+	@PostMapping("batch-save")
+	public Result save(@RequestBody List<GovMenuDTO> formList, @LoginUser TokenDto tokenDto){
+		//效验数据
+		ValidatorUtils.validateEntity(formList, AddGroup.class, DefaultGroup.class);
+		for(GovMenuDTO dto:formList){
+			govMenuService.save(dto,tokenDto);
+		}
+		return new Result();
+	}
+
 	@PutMapping
 	public Result update(@RequestBody GovMenuDTO dto, @LoginUser TokenDto tokenDto){
 		//效验数据

epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/controller/OperMenuController.java

@@ -1,11 +1,9 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
-import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.ExcelUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcNatDTO.java

@@ -61,6 +61,15 @@ public class IcNatDTO implements Serializable {
      */
     private String idCard;
 
+    /**
+     * 脱敏详情用
+     */
+    private String showMobile;
+    /**
+     * 脱敏详情用
+     */
+    private String showIdCard;
+
     /**
      * 检测时间，精确到分钟
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcTripReportRecordDTO.java

@@ -81,6 +81,11 @@ public class IcTripReportRecordDTO implements Serializable {
      */
     private String realMobile;
 
+    /**
+     * 脱敏
+     */
+    private String showMobile;
+
     /**
      * 身份证号
      */
@@ -93,6 +98,11 @@ public class IcTripReportRecordDTO implements Serializable {
      */
     private String realIdCard;
 
+    /**
+     * 脱敏
+     */
+    private String showIdCard;
+
     /**
      * 用户id
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcVaccineDTO.java

@@ -36,12 +36,12 @@ public class IcVaccineDTO implements Serializable {
      * 手机号
      */
 	private String mobile;
-
+    private String showMobile;
     /**
      * 身份证号
      */
 	private String idCard;
-
+    private String showIdCard;
     /**
      * 是否客户下居民(0:否  1:是)
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/EpidemicPreventionResultDTO.java

@@ -38,6 +38,15 @@ public class EpidemicPreventionResultDTO implements Serializable {
      */
     private String idCard;
 
+    /**
+     * 脱敏详情用
+     */
+    private String showMobile;
+    /**
+     * 脱敏详情用
+     */
+    private String showIdCard;
+
     private String birthDay;
 
     /**

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/VaccinationListResultDTO.java

@@ -42,7 +42,10 @@ public class VaccinationListResultDTO implements Serializable {
      * 真实手机号
      */
     private String realMobile;
-
+    /**
+     * 脱敏详情用
+     */
+    private String showMobile;
     /**
      * 身份证
      */
@@ -52,6 +55,10 @@ public class VaccinationListResultDTO implements Serializable {
      * 真实的身份证
      */
     private String realIdCard;
+    /**
+     * 脱敏详情用
+     */
+    private String showIdCard;
 
     private String sex;
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicPreventionController.java

@@ -82,6 +82,7 @@ public class IcEpidemicPreventionController{
      * @Author zhaoqifeng
      * @Date 2022/3/29 16:13
      */
+    @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     @PostMapping("detail")
     public Result<EpidemicPreventionResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody EpidemicPreventionFormDTO formDTO) {
         formDTO.setCustomerId(tokenDto.getCustomerId());

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcEpidemicSpecialAttentionController.java

@@ -87,6 +87,7 @@ public class IcEpidemicSpecialAttentionController {
      * @author zxc
      * @date 2022/4/27 15:47
      */
+    @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     @PostMapping("detail")
     public Result<VaccinationListResultDTO> detail(@RequestBody AttentionDetailFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,VaccinationListFormDTO.VaccinationListForm.class);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcNatController.java

@@ -125,6 +125,7 @@ public class IcNatController implements ResultDataResolver {
      * @Author sun
      * @Description 【核酸】核酸检测信息详情
      **/
+    @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     @NoRepeatSubmit
     @PostMapping("detail")
     public Result<IcNatDTO> detail(@RequestBody MyNatListFormDTO formDTO) {

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcTripReportRecordController.java

@@ -88,6 +88,7 @@ public class IcTripReportRecordController implements ResultDataResolver {
      * @param formDTO
      * @return
      */
+    @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     @PostMapping("detail")
     public Result<IcTripReportRecordDTO> detail(@LoginUser TokenDto tokenDto,@RequestBody IcTripReportRecordDTO formDTO){
         ValidatorUtils.validateEntity(formDTO,IcTripReportRecordDTO.DetailViewGroup.class);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcVaccineController.java

@@ -231,6 +231,7 @@ public class IcVaccineController  implements ResultDataResolver {
      * @Author sun
      * @Description 疫苗接种情况-列表点击查询详情
      **/
+    @MaskResponse(fieldNames = { "showMobile", "showIdCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD })
     @NoRepeatSubmit
     @PostMapping("detail")
     public Result<IcVaccineDTO> detail(@RequestBody IcVaccineFormDTO formDTO) {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcEpidemicSpecialAttentionServiceImpl.java

@@ -578,7 +578,12 @@ public class IcEpidemicSpecialAttentionServiceImpl extends BaseServiceImpl<IcEpi
      */
     @Override
     public VaccinationListResultDTO detail(AttentionDetailFormDTO formDTO) {
-        return baseDao.nat(formDTO);
+        VaccinationListResultDTO resultDTO=baseDao.nat(formDTO);
+        if (null != resultDTO) {
+            resultDTO.setShowMobile(resultDTO.getMobile());
+            resultDTO.setShowIdCard(resultDTO.getIdCard());
+        }
+        return resultDTO;
     }
 
     @Override

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java

@@ -216,7 +216,8 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
             return resultDTO;
         }
         resultDTO = ConvertUtils.sourceToTarget(entity, IcNatDTO.class);
-
+        resultDTO.setShowIdCard(resultDTO.getIdCard());
+        resultDTO.setShowMobile(resultDTO.getMobile());
         //2.查询对应的通知记录信息
         IcNoticeDTO dto = icNoticeService.getNotice(entity.getCustomerId(), entity.getIdCard());
         if (null != dto) {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -1751,8 +1751,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
             return result;
         }
         List<EpidemicPreventionResultDTO> list = baseDao.getEpidemicPreventionList(formDTO);
-        if (CollectionUtils.isNotEmpty(list)) {
+        if (CollectionUtils.isNotEmpty(list) && null != list.get(NumConstant.ZERO)) {
             result = list.get(NumConstant.ZERO);
+            result.setShowIdCard(result.getIdCard());
+            result.setShowMobile(result.getMobile());
             //查询网格名称
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(result.getGridId());
             if (null != gridInfo) {

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcTripReportRecordServiceImpl.java

@@ -464,6 +464,11 @@ public class IcTripReportRecordServiceImpl extends BaseServiceImpl<IcTripReportR
                 dto.setLatestNoticeTime(latestNotice.get(dto.getIdCard()));
             }
         }
-        return list.get(NumConstant.ZERO);
+        IcTripReportRecordDTO resultDto=list.get(NumConstant.ZERO);
+        if(null!=resultDto){
+            resultDto.setShowIdCard(resultDto.getIdCard());
+            resultDto.setShowMobile(resultDto.getMobile());
+        }
+        return resultDto;
     }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcVaccineServiceImpl.java

@@ -21,14 +21,12 @@ import com.epmet.constants.ImportTaskConstants;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dao.IcVaccineDao;
 import com.epmet.dao.IcVaccineRelationDao;
-import com.epmet.dto.IcNatDTO;
 import com.epmet.dto.IcVaccineDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.IcVaccineListResultDTO;
 import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
 import com.epmet.dto.result.VaccineListDTO;
-import com.epmet.entity.IcNatEntity;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcVaccineEntity;
 import com.epmet.entity.IcVaccineRelationEntity;
@@ -480,7 +478,12 @@ public class IcVaccineServiceImpl extends BaseServiceImpl<IcVaccineDao, IcVaccin
     @Override
     public IcVaccineDTO detail(String vaccineId) {
         IcVaccineEntity entity = baseDao.selectById(vaccineId);
-        return ConvertUtils.sourceToTarget(entity, IcVaccineDTO.class);
+        IcVaccineDTO res=ConvertUtils.sourceToTarget(entity, IcVaccineDTO.class);
+        if(null!=res){
+            res.setShowIdCard(res.getIdCard());
+            res.setShowMobile(res.getMobile());
+        }
+        return res;
     }
 
     @Override