luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

楼院小组-删除组成员-程序优化

master
sunyuchao 5 years ago
parent
484ba2c5c9
commit
f2536eabcc
6 changed files with 23 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
  2. 10
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java
  3. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
  4. 7
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
  5. 11
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
  6. 3
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

10
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java
View File

@ -26,15 +26,5 @@ public interface UserMessageConstant {
*/
String INVITED_JOIN_GROUP = "您的好友-【%s】通过邀请连接，加入了【%s】";
String DATA_ACQUISITION_FAILED = "数据库数据获取失败";
String DELETE_SUCCESS = "组成员删除成功";
String DELETE_FAILED = "组成员删除失败";
/**
* 删除组成员时对应话题操作日志表设置默认的屏蔽理由
*/
String DELETE_MEMBER_REASON = "删除组成员，屏蔽该成员话题";
}

10
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java
View File

@ -22,5 +22,15 @@ import com.epmet.commons.tools.exception.ErrorCode;
*/
public interface ModuleErrorCode extends ErrorCode {
String DATA_ACQUISITION_FAILED = "数据库数据获取失败";
String DELETE_SUCCESS = "组成员删除成功";
String DELETE_FAILED = "组成员删除失败";
/**
* 删除组成员时对应话题操作日志表设置默认的屏蔽理由
*/
String DELETE_MEMBER_REASON = "删除组成员，屏蔽该成员话题";
}

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
View File

@ -21,7 +21,7 @@ import java.util.List;
* @Author yinzuomei
* @Date 2020/3/16 14:48
*/
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class)
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class,url="http://localhost:8087")
public interface EpmetUserFeignClient {
/**

7
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java
View File

@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.UserRoleFormDTO;
import com.epmet.dto.result.UserRoleResultDTO;
import com.epmet.modules.constant.UserMessageConstant;
import com.epmet.modules.exception.ModuleErrorCode;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.group.dao.ResiGroupStatisticalDao;
import com.epmet.modules.group.entity.ResiGroupEntity;
@ -124,7 +125,7 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
Result result = new Result();
ResiGroupStatisticalEntity entity = baseDao.selectByResiGroupId(resiGroupMemberEntity.getResiGroupId());
if (null == entity) {
result.error(UserMessageConstant.DATA_ACQUISITION_FAILED);
result.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
return result;
}
//成员总数
@ -134,7 +135,7 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
//1:根据组Id查询客户Id
ResiGroupEntity resiGroupEntity = resiGroupServiceImpl.selectById(entity.getResiGroupId());
if (null == resiGroupEntity) {
result.error(UserMessageConstant.DATA_ACQUISITION_FAILED);
result.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
return result;
}
//2:根据客户Id、用户Id查询被删除成员角色
@ -144,7 +145,7 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl<ResiGroupSt
userRoleFormDTO.setUserId(resiGroupMemberEntity.getCustomerUserId());
Result<List<UserRoleResultDTO>> resultList = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
if (!resultList.success()) {
result.error(UserMessageConstant.DATA_ACQUISITION_FAILED);
result.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
return result;
}
for (UserRoleResultDTO userRole : resultList.getData()) {

11
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
View File

@ -33,6 +33,7 @@ import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.feign.MessageFeignClient;
import com.epmet.modules.constant.UserMessageConstant;
import com.epmet.modules.exception.ModuleErrorCode;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.group.service.ResiGroupService;
import com.epmet.modules.group.service.ResiGroupStatisticalService;
@ -432,16 +433,16 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
//2、group_member_operation新增一条记录
ResiGroupMemberEntity resiGroupMemberEntity = baseDao.selectById(removeMemberFormDTO.getMemerId());
if (null == resiGroupMemberEntity) {
logger.error(UserMessageConstant.DATA_ACQUISITION_FAILED);
result.error(UserMessageConstant.DELETE_FAILED);
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
result.error(ModuleErrorCode.DELETE_FAILED);
return result;
}
groupMemeberOperationService.saveMemberOperation(removeMemberFormDTO, resiGroupMemberEntity);
//3、修改resi_group_statistical表数据:成员总数-1,普通居民总数-1，热心居民或者党员数根据被删除的用户身份来判断
result = resiGroupStatisticalService.upGroupStatistical(removeMemberFormDTO, resiGroupMemberEntity);
if (!result.success()) {
logger.error(UserMessageConstant.DATA_ACQUISITION_FAILED);
result.error(UserMessageConstant.DELETE_FAILED);
logger.error(ModuleErrorCode.DATA_ACQUISITION_FAILED);
result.error(ModuleErrorCode.DELETE_FAILED);
return result;
}
//4、之前这个人发布的话题根据前端传过来的屏蔽标志更新话题状态(移除一条话题在话题操作日志表添加一条日志)
@ -449,7 +450,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
resiTopicService.upResiTopic(removeMemberFormDTO, resiGroupMemberEntity);
}
//5、评论和产品沟通后，说可以留着。
//result.setMsg(UserMessageConstant.DELETE_SUCCESS);
logger.info(ModuleErrorCode.DELETE_SUCCESS);
return result;
}
}

3
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
View File

@ -31,6 +31,7 @@ import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.form.UserResiInfoListFormDTO;
import com.epmet.dto.result.UserResiInfoResultDTO;
import com.epmet.modules.constant.UserMessageConstant;
import com.epmet.modules.exception.ModuleErrorCode;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.group.dao.ResiGroupDao;
import com.epmet.modules.group.dao.ResiGroupStatisticalDao;
@ -616,7 +617,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
resiTopicOperationEntity = new ResiTopicOperationEntity();
resiTopicOperationEntity.setTopicId(dto.getId());
resiTopicOperationEntity.setOperationType(TopicConstant.HIDDEN);
resiTopicOperationEntity.setOperationReason(UserMessageConstant.DELETE_MEMBER_REASON);
resiTopicOperationEntity.setOperationReason(ModuleErrorCode.DELETE_MEMBER_REASON);
resiTopicOperationEntity.setDelFlag(NumConstant.ZERO_STR);
resiTopicOperationEntity.setRevision(NumConstant.ZERO);
resiTopicOperationEntity.setCreatedBy(removeMemberFormDTO.getUserId());

Write Preview
Loading…
Cancel
Save