Browse Source

调整applygroupdetail接口返回参数,去除多余属性,与接口文档上保持一致,不能暴露数据库相关属性。

master
wangchao 5 years ago
parent
commit
bb4be54596
  1. 71
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java
  2. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java
  3. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java
  4. 2
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
  5. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

71
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java

@ -0,0 +1,71 @@
package com.epmet.resi.group.dto.group.result;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* @Description 建组申请详情 请求返回实体 与NEI一致
* @ClassName ApplyingGroupDetailResult2DTO
* @Auth wangc
* @Date 2020-04-30 10:10
*/
@Data
public class ApplyingGroupDetailResult2DTO implements Serializable {
private static final long serialVersionUID = -924420303614397953L;
/**
* 组Id
* */
private String groupId;
/**
* 组名称
* */
private String groupName;
/**
* 组头像
* */
private String groupHeadPhoto;
/**
* 组介绍
* */
private String groupIntroduction;
/**
* 申请时间
* */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
private Date createdTime;
/**
* 组长名称
* */
private String groupLeaderName;
/**
* 已同意该申请approved 已驳回rejected
* */
private String status;
/**
* 驳回理由
* */
private String rejectReason;
/**
* 街道
* */
private String street;
/**
* 未读已读标识 unread read
* */
private String readFlag;
}

2
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java

@ -7,7 +7,7 @@ import java.io.Serializable;
import java.util.Date;
/**
* @Description 建组申请详情
* @Description 建组申请详情 mapper查询返回 与NEI不一致
* @ClassName ApplyingGroupDetailResultDTO
* @Author wangc
* @date 2020.04.17 16:13

4
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@ -263,12 +263,12 @@ public class ResiGroupController {
/**
* @Description 得到待审核/未审核小组信息的详情
* @Param CommonGroupIdFromDTO -> String groupId; String userId
* @return Result<ApplyingGroupDetailResultDTO>
* @return Result<ApplyingGroupDetailResult2DTO>
* @Author wangc
* @Date 2020.04.20 14:08
**/
@PostMapping("getapplyinggroupdetail")
public Result<ApplyingGroupDetailResultDTO> getApplyingGroupDetail(@RequestBody CommonGroupIdFromDTO groupIdFromDTO){
public Result<ApplyingGroupDetailResult2DTO> getApplyingGroupDetail(@RequestBody CommonGroupIdFromDTO groupIdFromDTO){
ValidatorUtils.validateEntity(groupIdFromDTO);
return resiGroupService.getApplyingGroupDetail(groupIdFromDTO);
}

2
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java

@ -240,5 +240,5 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
* @Author wangc
* @Date 2020.04.19 23:32
**/
Result<ApplyingGroupDetailResultDTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId);
Result<ApplyingGroupDetailResult2DTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId);
}

4
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@ -751,7 +751,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
* @Date 2020.04.19 23:32
**/
@Override
public Result<ApplyingGroupDetailResultDTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId){
public Result<ApplyingGroupDetailResult2DTO> getApplyingGroupDetail(CommonGroupIdFromDTO groupId){
//1.查询小组信息
//注意,这里查询出的组申请详情中,无论是已审核还是未审核,都是将该组信息关联到初始化组时状态为[待审核、审核通过、拒绝]其中之一的组操作记录上,并读取审核的已读未读信息,上述三种状态在一个组的所有操作记录当中只可能存在一种,与之后的屏蔽、取消屏蔽、关闭无关,如果查出多条说明建组的逻辑有问题
ApplyingGroupDetailResultDTO detail = baseDao.getApplyingGroupDetailByGroupId(groupId.getGroupId());
@ -782,7 +782,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
detail.setLeaderId(null);
detail.setOperationId(null);
return new Result<ApplyingGroupDetailResultDTO>().ok(detail);
return new Result<ApplyingGroupDetailResult2DTO>().ok(ConvertUtils.sourceToTarget(detail, ApplyingGroupDetailResult2DTO.class));
}
/**
* @Description 给加入此网格的网格长发送消息

Loading…
Cancel
Save