Merge branch 'feature/yujt_comm_edu' of http://121.42.41.42:7070/r/epdc-cloud-property-yushan into feature/yujt_comm_edu

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/GroupController.java

@@ -25,8 +25,8 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 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.UpdateGroup;
 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.dto.group.*;
 import com.elink.esua.epdc.modules.group.excel.GroupExcel;
 import com.elink.esua.epdc.modules.group.service.GroupService;
@@ -109,6 +109,14 @@ public class GroupController {
         return new Result();
     }
 
+    @PostMapping("interest")
+    public Result saveInterest(@RequestBody GroupDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        groupService.saveInterest(dto);
+        return new Result();
+    }
+
     @PutMapping
     public Result update(@RequestBody GroupDTO dto) {
         //效验数据
@@ -117,6 +125,14 @@ public class GroupController {
         return new Result();
     }
 
+    @PutMapping("interest")
+    public Result updateInterest(@RequestBody GroupDTO dto) {
+        //效验数据
+        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        groupService.updateInterest(dto);
+        return new Result();
+    }
+
     @DeleteMapping
     public Result delete(@RequestBody String[] ids) {
         //效验数据

epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/dao/GroupDao.java

@@ -56,7 +56,7 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      *
      * @return java.util.List<com.elink.esua.epdc.dto.group.GroupDTO>
      * @params [params]
-     * @author liuchuang
+     * @author zhy
      * @since 2019/10/11 14:54
      */
     List<GroupManagementDTO> selectPoliceListOfGroups(Map<String, Object> params);
@@ -66,11 +66,21 @@ public interface GroupDao extends BaseDao<GroupEntity> {
      *
      * @return java.util.List<com.elink.esua.epdc.dto.group.GroupDTO>
      * @params [params]
-     * @author liuchuang
+     * @author zhy
      * @since 2019/10/11 14:54
      */
     List<GroupManagementDTO> selectInterestListOfGroups(Map<String, Object> params);
 
+    /**
+     * 兴趣群列表
+     *
+     * @return java.util.List<com.elink.esua.epdc.dto.group.GroupDTO>
+     * @params [deptId categoryCode]
+     * @author zhy
+     * @since 2019/10/11 14:54
+     */
+    List<GroupManagementDTO> selectInterestGroupByDept(@Param("deptId") Long deptId, @Param("categoryCode") String categoryCode);
+
     /**
      * 查询社群名称重复数量
      *
@@ -181,11 +191,12 @@ public interface GroupDao extends BaseDao<GroupEntity> {
     List<String> listPartyMemberGridId();
 
     /**
-     * @Description: 根据社群id，查询群主手机号
+     * 根据社群id，查询群主手机号
-     * @Param: [groupId]
+     *
-     * @return: java.lang.String
+     * @return java.lang.String
-     * @Author: zy
+     * @params [groupId]
-     * @Date: 2020-01-08
+     * @author zy
+     * @since 2020-01-08
      */
     String queryGroupUserMOBILE(String groupId);
 

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

@@ -98,6 +98,17 @@ public interface GroupService extends BaseService<GroupEntity> {
      */
     void save(GroupDTO dto);
 
+
+    /**
+     * 兴趣群保存
+     *
+     * @param dto
+     * @return void
+     * @author zhy
+     * @date 2019-10-10
+     */
+    void saveInterest(GroupDTO dto);
+
     /**
      * 默认更新
      *
@@ -108,6 +119,16 @@ public interface GroupService extends BaseService<GroupEntity> {
      */
     void update(GroupDTO dto);
 
+    /**
+     * 兴趣群更新
+     *
+     * @param dto
+     * @return void
+     * @author zhy
+     * @date 2019-10-10
+     */
+    void updateInterest(GroupDTO dto);
+
     /**
      * 批量删除
      *

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

@@ -21,14 +21,17 @@ 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;
+import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils;
 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.constant.OrganizationTypeConstant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 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.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.UserDTO;
 import com.elink.esua.epdc.dto.constant.GroupConstant;
 import com.elink.esua.epdc.dto.constant.GroupNoticeConstant;
@@ -44,6 +47,7 @@ import com.elink.esua.epdc.dto.group.result.*;
 import com.elink.esua.epdc.enums.ItemHandleCategoryEnum;
 import com.elink.esua.epdc.modules.async.IssueOverseeResultsTask;
 import com.elink.esua.epdc.modules.async.NewsTask;
+import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.EventFeignClient;
 import com.elink.esua.epdc.modules.feign.UserFeignClient;
 import com.elink.esua.epdc.modules.group.dao.GroupDao;
@@ -80,6 +84,9 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
     @Autowired
     private NewsTask newsTask;
 
+    @Autowired
+    private AdminFeignClient adminFeignClient;
+
     @Autowired
     private GroupTopicUserReadService groupTopicUserReadService;
 
@@ -145,6 +152,30 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
         insert(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void saveInterest(GroupDTO dto) {
+        GroupEntity entity = ConvertUtils.sourceToTarget(dto, GroupEntity.class);
+
+        // 查询重复
+        List<GroupManagementDTO> dtos = baseDao.selectInterestGroupByDept(dto.getDeptId(), dto.getCategoryCode());
+        if (dtos.size() > 0) {
+            throw new RenException("该机构已经存在兴趣群");
+        }
+
+        ParentAndAllDeptDTO parentAndAllDeptDTO = getParentAndAllDeptDTO(dto.getDeptId() + "");
+        // 保存机构，及其他冗余字段。
+        DeptEntityUtils.loadDeptInfo(
+                ConvertUtils.sourceToTarget(parentAndAllDeptDTO, DeptEntityUtils.DeptDto.class),
+                entity
+        );
+        entity.setDeptName(parentAndAllDeptDTO.getGrid());
+        entity.setSectionCode(GroupConstant.INTEREST_GROUP_CATEGORY_CODE);
+        entity.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue());
+//        entity.setTypeKey(parentAndAllDeptDTO);
+        insert(entity);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(GroupDTO dto) {
@@ -152,6 +183,13 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
         updateById(entity);
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateInterest(GroupDTO dto) {
+        GroupEntity entity = ConvertUtils.sourceToTarget(dto, GroupEntity.class);
+        updateById(entity);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void delete(String[] ids) {
@@ -621,4 +659,23 @@ public class GroupServiceImpl extends BaseServiceImpl<GroupDao, GroupEntity> imp
 
         return groupEntities;
     }
+
+    /**
+     * 根据网格ID获取冗余的组织机构信息
+     *
+     * @param
+     * @return com.elink.esua.epdc.dto.ParentAndAllDeptDTO
+     * @author rongchao
+     * @since 2019-12-19
+     */
+    private ParentAndAllDeptDTO getParentAndAllDeptDTO(String gridId) {
+        // 获取组织结构冗余信息
+        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(gridId);
+        ParentAndAllDeptDTO parentAndAllDeptDTO = parentAndAllDeptDTOResult.getData();
+
+        if (!parentAndAllDeptDTOResult.success()) {
+            throw new RenException(parentAndAllDeptDTOResult.getMsg());
+        }
+        return parentAndAllDeptDTO;
+    }
 }

epdc-cloud-property/src/main/resources/mapper/group/GroupDao.xml

@@ -9,6 +9,8 @@
         gp.GROUP_NAME,
         gp.GROUP_CATEGORY,
         gp.CREATED_TIME,
+        gp.SECTION_CODE,
+        gp.CATEGORY_CODE,
         ugp.NICKNAME,
         gp.STATE
         FROM
@@ -46,6 +48,8 @@
         gp.GROUP_NAME,
         gp.GROUP_CATEGORY,
         gp.CREATED_TIME,
+        gp.SECTION_CODE,
+        gp.CATEGORY_CODE,
         ugp.NICKNAME,
         gp.STATE
         FROM
@@ -61,6 +65,10 @@
         <if test="state != null and state != ''">
             AND gp.STATE = #{state}
         </if>
+        <if test="deptId != null and deptId != ''">
+            AND (gp.DEPT_ID = #{deptId}
+            OR find_in_set(#{deptId},gp.ALL_DEPT_IDS))
+        </if>
         <if test="gridId != null and gridId != ''">
             AND (gp.DEPT_ID = #{gridId}
             OR find_in_set(#{gridId},gp.ALL_DEPT_IDS))
@@ -83,6 +91,9 @@
         gp.GROUP_NAME,
         gp.GROUP_CATEGORY,
         gp.CREATED_TIME,
+        gp.SECTION_CODE,
+        gp.CATEGORY_CODE,
+        gp.ALL_DEPT_NAMES,
         ugp.NICKNAME,
         gp.STATE
         FROM
@@ -92,12 +103,17 @@
         AND ugp.LORD_FLAG = '1'
         WHERE
         gp.DEL_FLAG = '0'
-        AND gp.SECTION_CODE = 'theme_group'
+        AND gp.SECTION_CODE = 'interest_group'
-        AND gp.CATEGORY_CODE = 'interest_group'
+        <if test="categoryCode != null and categoryCode != ''">
-        AND gp.TYPE_KEY = 'grid_party'
+            AND gp.CATEGORY_CODE = 'interest_group'
+        </if>
         <if test="state != null and state != ''">
             AND gp.STATE = #{state}
         </if>
+        <if test="deptId != null and deptId != ''">
+            AND (gp.DEPT_ID = #{deptId}
+            OR find_in_set(#{deptId},gp.ALL_DEPT_IDS))
+        </if>
         <if test="gridId != null and gridId != ''">
             AND (gp.DEPT_ID = #{gridId}
             OR find_in_set(#{gridId},gp.ALL_DEPT_IDS))
@@ -114,6 +130,26 @@
         gp.GROUP_CATEGORY, gp.CREATED_TIME DESC
     </select>
 
+    <select id="selectInterestGroupByDept" resultType="com.elink.esua.epdc.dto.group.GroupManagementDTO">
+        SELECT
+        gp.ID,
+        gp.GROUP_NAME,
+        gp.GROUP_CATEGORY,
+        gp.CREATED_TIME,
+        gp.STATE
+        FROM
+        epdc_group gp
+        WHERE
+        gp.DEL_FLAG = '0'
+        AND gp.SECTION_CODE = 'interest_group'
+        <if test="categoryCode != null and categoryCode != ''">
+            AND gp.CATEGORY_CODE = #{categoryCode}
+        </if>
+        <if test="deptId != null and deptId != ''">
+            AND gp.DEPT_ID = #{deptId}
+        </if>
+    </select>
+
     <select id="selectListOfRepeatGroupName" resultType="long">
         SELECT COUNT(ID) amount FROM epdc_group WHERE DEL_FLAG = '0' AND DEPT_ID = #{gridId} AND GROUP_NAME = #{groupName}
     </select>