兴趣群新增字段添加

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActivityParticipantServiceImpl.java

@@ -21,9 +21,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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.constant.NumConstant;
 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.IdentityNoUtils;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.activity.ActivityParticipantDTO;
 import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO;
@@ -38,7 +38,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
-import java.util.Calendar;
 import java.util.List;
 import java.util.Map;
 
@@ -120,14 +119,6 @@ public class ActivityParticipantServiceImpl extends BaseServiceImpl<ActivityPart
     }
 
     private Integer getAge(String identityNo) {
-        // 身份证只有15或18位
+        return IdentityNoUtils.getAge(identityNo);
-        if (identityNo.length() != NumConstant.EIGHTEEN && identityNo.length() != NumConstant.FIFTEEN) {
-            return 0;
-        }
-        // 默认身份证是正确的，粗略计算
-        Calendar cal = Calendar.getInstance();
-        int yearNow = cal.get(Calendar.YEAR);
-        int year = Integer.parseInt(identityNo.substring(6, 10));
-        return yearNow - year;
     }
 }

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @email yujintao@elink-cn.com
  * @date 2019/9/5 14:44
  */
-@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class)
+@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class,url = "http://localhost:9092")
 public interface AdminFeignClient {
 
     /**

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/GroupServiceImpl.java

@@ -17,7 +17,6 @@
 
 package com.elink.esua.epdc.modules.group.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
@@ -30,21 +29,20 @@ 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.constant.SysSmsTemplateConstant;
-import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.DeptLevelAndLeaderDTO;
-import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
-import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.constant.GroupConstant;
 import com.elink.esua.epdc.dto.constant.GroupNoticeConstant;
+import com.elink.esua.epdc.dto.enums.GroupStateEnum;
+import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.epdc.result.EpdcGridUserResultDTO;
 import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
 import com.elink.esua.epdc.dto.form.SmsNoticeFormDTO;
 import com.elink.esua.epdc.dto.group.*;
-import com.elink.esua.epdc.dto.enums.GroupStateEnum;
-import com.elink.esua.epdc.dto.enums.GroupUserStateEnum;
 import com.elink.esua.epdc.dto.group.form.*;
-import com.elink.esua.epdc.dto.group.result.*;
+import com.elink.esua.epdc.dto.group.result.GroupDetailForMobileEndResultDTO;
-import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
+import com.elink.esua.epdc.dto.group.result.GroupUserListResultDTO;
+import com.elink.esua.epdc.dto.group.result.GroupsOfMineResultDTO;
+import com.elink.esua.epdc.dto.group.result.GroupsOfRecommendResultDTO;
 import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
@@ -67,7 +65,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * 社群表 社群表
@@ -163,16 +160,17 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
             throw new RenException("该机构已经存在兴趣群");
         }
 
-        ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(dto.getDeptId() + "");
+        DeptLevelAndLeaderDTO deptLevelAndLeaderDTO = getDeptlevelById(dto.getDeptId());
         // 保存机构，及其他冗余字段。
         DeptEntityUtils.loadDeptInfo(
-                ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
+                ConvertUtils.sourceToTarget(deptLevelAndLeaderDTO, DeptEntityUtils.DeptDto.class),
                 entity
         );
-        entity.setDeptName(parentAndAllDeptDTO.getGrid());
+
+        entity.setDeptName(deptLevelAndLeaderDTO.getDeptName());
         entity.setSectionCode(GroupConstant.INTEREST_GROUP_CATEGORY_CODE);
         entity.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue());
-//        entity.setTypeKey(parentAndAllDeptDTO);
+        entity.setTypeKey(deptLevelAndLeaderDTO.getTypeKey());
         insert(entity);
     }
 
@@ -668,10 +666,10 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
      * @author rongchao
      * @since 2019-12-19
      */
-    private ParentAndAllDeptDTO getParentAndAllDeptDTO(String gridId) {
+    private DeptLevelAndLeaderDTO getDeptlevelById(Long gridId) {
         // 获取组织结构冗余信息
-        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(gridId);
+        Result<DeptLevelAndLeaderDTO> parentAndAllDeptDTOResult = adminFeignClient.getDeptlevelById(gridId);
-        ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData();
+        DeptLevelAndLeaderDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData();
 
         if (!parentAndAllDeptDTOResult.success()) {
             throw new RenException(parentAndAllDeptDTOResult.getMsg());