diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/AppGroupController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/AppGroupController.java index 76ad2b7..3db8954 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/AppGroupController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/controller/AppGroupController.java @@ -48,45 +48,6 @@ public class AppGroupController { return groupService.saveGroup(formDto); } - /** - * - * 创建网格党员群 - * - * @params [formDto] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/11/21 0:01 - */ - @PostMapping("createParty") - public Result createPartyGroup(@RequestBody CompleteDeptDTO formDto) { - GroupCreateFormDTO groupCreateFormDto = ConvertUtils.sourceToTarget(formDto, GroupCreateFormDTO.class); - groupCreateFormDto.setGroupName(formDto.getCommunity().concat(formDto.getGrid()).concat(GroupConstant.PARTY_GROUP_NAME_SUFFIX)); - groupCreateFormDto.setGroupAvatar(GroupConstant.PARTY_GROUP_AVATAR); - groupCreateFormDto.setGroupIntroduction(formDto.getStreet().concat(formDto.getCommunity()).concat(formDto.getGrid())); - groupCreateFormDto.setGroupCategory(NumConstant.ZERO_STR); - groupCreateFormDto.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue()); - groupCreateFormDto.setAllDeptIds(formDto.getDistrictId() + "," + formDto.getStreetId() + "," + formDto.getCommunityId() + "," + formDto.getGridId()); - groupCreateFormDto.setAllDeptNames(formDto.getDistrict() + "-" + formDto.getStreet() + "-" + formDto.getCommunity() + "-" + formDto.getGrid()); - groupCreateFormDto.setParentDeptIds(formDto.getDistrictId() + "," + formDto.getStreetId() + "," + formDto.getCommunityId()); - groupCreateFormDto.setParentDeptNames(formDto.getDistrict() + "-" + formDto.getStreet() + "-" + formDto.getCommunity()); - - return groupService.saveGroup(groupCreateFormDto); - } - - /** - * - * 批量创建网格党员群 - * - * @params [depts] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/12/19 9:42 - */ - @PostMapping("createPartys") - public Result createPartyGroups(@RequestBody List depts) { - return groupService.savePartyGroups(depts); - } - /** * * 解散社群 diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/GroupService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/GroupService.java index e15319a..02d43e9 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/GroupService.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/GroupService.java @@ -274,17 +274,6 @@ public interface GroupService extends BaseService { */ Result joinGridPartyGroup(List formDto); - /** - * - * 批量生成网格党员群 - * - * @params [deptList] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author liuchuang - * @since 2019/12/19 9:34 - */ - Result savePartyGroups(List deptList); - /** * @param * @return com.elink.esua.epdc.commons.tools.utils.Result> diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/GroupServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/GroupServiceImpl.java index 283e5f6..01c5d86 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/GroupServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/group/service/impl/GroupServiceImpl.java @@ -434,44 +434,6 @@ public class GroupServiceImpl extends BaseServiceImpl imp return new Result(); } - /** - * @param deptList - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author yinzuomei - * @Description 批量生成网格党员群 - * @Date 2019/12/19 14:41 - **/ - @Override - public Result savePartyGroups(List deptList) { - if(CollUtil.isEmpty(deptList)){ - return new Result().error("请选择网格"); - } - //在创建党员群的时候,查询当前网格下的党员用户和网格长用户 - List gridIdList=new ArrayList<>(); - for(CompleteDeptDTO completeDeptDTO:deptList){ - gridIdList.add(completeDeptDTO.getGridId()); - } - Result> gridUserList=userFeignClient.queryGroupUsers(gridIdList); - //将集合转为Map,key为网格id - Map> map=gridUserList.getData().stream().collect(Collectors.groupingBy(EpdcGridUserResultDTO::getGridId)); - for (CompleteDeptDTO dept : - deptList) { - GroupBatchCreateFormDTO groupCreateFormDto = ConvertUtils.sourceToTarget(dept, GroupBatchCreateFormDTO.class); - groupCreateFormDto.setGroupName(dept.getCommunity().concat(dept.getGrid()).concat(GroupConstant.PARTY_GROUP_NAME_SUFFIX)); - groupCreateFormDto.setGroupAvatar(GroupConstant.PARTY_GROUP_AVATAR); - groupCreateFormDto.setGroupIntroduction(dept.getStreet().concat(dept.getCommunity()).concat(dept.getGrid())); - groupCreateFormDto.setGroupCategory(NumConstant.ZERO_STR); - groupCreateFormDto.setState(GroupStateEnum.GROUP_STATE_EXAMINATION_PASSED.getValue()); - groupCreateFormDto.setAllDeptIds(dept.getDistrictId() + "," + dept.getStreetId() + "," + dept.getCommunityId() + "," + dept.getGridId()); - groupCreateFormDto.setAllDeptNames(dept.getDistrict() + "-" + dept.getStreet() + "-" + dept.getCommunity() + "-" + dept.getGrid()); - groupCreateFormDto.setParentDeptIds(dept.getDistrictId() + "," + dept.getStreetId() + "," + dept.getCommunityId()); - groupCreateFormDto.setParentDeptNames(dept.getDistrict() + "-" + dept.getStreet() + "-" + dept.getCommunity()); - List groupUserFormDTOList=ConvertUtils.sourceToTarget(map.get(dept.getGridId()), GroupUserFormDTO.class); - groupCreateFormDto.setGroupUserFormDTOList(groupUserFormDTOList); - this.saveGroups(groupCreateFormDto); - } - return new Result(); - } @Transactional(rollbackFor = Exception.class) public Result saveGroups(GroupBatchCreateFormDTO formDto) {