diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java index dec7a89cc7..29c416a0a7 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java @@ -134,4 +134,8 @@ public class CustomerStaffDTO implements Serializable { */ private String password; + private String idCard; + private String culture; + private Date birthday; + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java index ea1763af18..8a29563dd2 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.dto.govorg.form; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; @@ -48,4 +49,16 @@ public class StaffDetailV2FormDTO implements Serializable { private List szsqRoles; private String customerId; + private String idCard; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date birthday; + /** + * 文化程度 + */ + private String culture; + /** + * 文化程度，中文 + */ + private String cultureDisplay; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 33b3dcea12..0841274180 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -138,6 +138,11 @@ 2.0.0 compile + + com.epmet + epmet-admin-client + 2.0.0 + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 67fd1c711d..263a862971 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -217,7 +217,7 @@ public class GovOrgController { return new Result().ok(govOrgService.getCurrentOrgStafflist(formDTO)); } - /** + /**w * @Param formDTO * @Description 【通讯录】人员详情v2 * @author sun diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index ea9980e7af..96f4162fe8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -5,12 +5,14 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.rocketmq.messages.CheckMQMsg; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.IdAndNameDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; @@ -50,6 +52,7 @@ import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.opercustomize.CustomerFootBarService; import com.epmet.dto.IcResiUserDTO; +import com.epmet.dto.SysDictDataDTO; import com.epmet.dto.UserBaseInfoDTO; import com.epmet.dto.form.DetailByTypeFormDTO; import com.epmet.dto.form.GetStaffExistRoleFormDTO; @@ -57,6 +60,7 @@ import com.epmet.dto.form.SystemMsgFormDTO; import com.epmet.dto.result.DetailByTypeResultDTO; import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.dto.result.StaffRoleResultDTO; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.GovAccessFeignClient; import com.github.pagehelper.PageHelper; @@ -83,7 +87,7 @@ import java.util.stream.Collectors; @Service @DataSource(DataSourceConstant.EPMET_USER) @Slf4j -public class EpmetUserServiceImpl implements EpmetUserService { +public class EpmetUserServiceImpl implements EpmetUserService, ResultDataResolver { @Autowired private UserBaseInfoDao userBaseInfoDao; @@ -121,6 +125,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @Autowired private GovAccessFeignClient govAccessFeignClient; + @Autowired + private EpmetAdminOpenFeignClient adminOpenFeignClient; /** * @Description 根据UserIds查询 @@ -752,6 +758,16 @@ public class EpmetUserServiceImpl implements EpmetUserService { result.setName(dto.getRealName()); result.setGender(dto.getGender().toString()); result.setRoles(list); + + List dict = getResultDataOrReturnNull(adminOpenFeignClient.dictDataList("education"), ServiceConstant.EPMET_ADMIN_SERVER); + if (CollectionUtils.isNotEmpty(dict)) { + for (SysDictDataDTO d : dict) { + if (d.getDictValue().equals(dto.getCulture())) { + result.setCultureDisplay(d.getDictLabel()); + break; + } + } + } // 获取数字社区里的新角色 GetStaffExistRoleFormDTO getStaffExistRoleFormDTO = new GetStaffExistRoleFormDTO(); getStaffExistRoleFormDTO.setStaffId(staffId); diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java index 87b641b564..fb53b15ab3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -55,4 +57,10 @@ public class StaffInitResultDTO implements Serializable { * xxx-xxx */ private String agencyName; + + private String culture; + + private String cultureDisplay; + @JsonFormat(pattern = "yyyy-MM-dd") + private Date birthday; } diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java index 66ec701d54..f0f2cb5d58 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/CategoryDictServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 文章栏目表 @@ -138,7 +139,18 @@ public class CategoryDictServiceImpl extends BaseServiceImpl idList = Arrays.asList(ids); + + List idList2Del = idList.stream().map(id -> { + CategoryDictEntity dict = baseDao.selectById(id); + if (dict == null || StringUtils.isBlank(dict.getPid().trim()) || "0".equals(dict.getPid())) { + // 一级分类的情况下，不执行删除。一级分类的id已经被固定到了菜单中，要删除了，就对应不起来了 + return false; + } + return true; + }).collect(Collectors.toList()); + + baseDao.deleteBatchIds(idList2Del); } @Override diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java index cd042877ab..f92d694e3c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java @@ -149,5 +149,7 @@ public class CustomerStaffDTO implements Serializable { * 身份证号 */ private String idCard; + private String culture; + private Date birthday; } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index fcc7fdba67..9b55a2e861 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; @@ -54,10 +55,7 @@ import com.epmet.entity.CustomerStaffEntity; import com.epmet.entity.GovStaffRoleEntity; import com.epmet.entity.StaffRoleEntity; import com.epmet.entity.UserEntity; -import com.epmet.feign.AuthFeignClient; -import com.epmet.feign.GovAccessFeignClient; -import com.epmet.feign.GovOrgOpenFeignClient; -import com.epmet.feign.OperCrmOpenFeignClient; +import com.epmet.feign.*; import com.epmet.service.CustomerStaffService; import com.epmet.service.GovStaffRoleService; import com.epmet.service.StaffRoleService; @@ -88,7 +86,7 @@ import java.util.stream.Collectors; */ @Slf4j @Service -public class CustomerStaffServiceImpl extends BaseServiceImpl implements CustomerStaffService { +public class CustomerStaffServiceImpl extends BaseServiceImpl implements CustomerStaffService, ResultDataResolver { private final Logger logger = LogManager.getLogger(getClass()); @Autowired private GovStaffRoleService govStaffRoleService; @@ -113,6 +111,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -342,6 +343,20 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffRoleResultDTOS = ConvertUtils.sourceToTarget(staffExistRole.getData(), StaffRoleResultDTO.class); resultDTO.setNewRoleList(staffRoleResultDTOS); } + + resultDTO.setIdCard(customerStaffDTO.getIdCard()); + resultDTO.setBirthday(customerStaffDTO.getBirthday()); + resultDTO.setCulture(customerStaffDTO.getCulture()); + + List dict = getResultDataOrReturnNull(adminOpenFeignClient.dictDataList("education"), ServiceConstant.EPMET_ADMIN_SERVER); + if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(dict)) { + for (SysDictDataDTO d : dict) { + if (d.getDictValue().equals(customerStaffDTO.getCulture())) { + resultDTO.setCultureDisplay(d.getDictLabel()); + break; + } + } + } return new Result().ok(resultDTO); }