Browse Source

修改接口返回参数属性名称,居民段政府端表决中接口修改

dev_shibei_match
wangchao 5 years ago
parent
commit
cc6906183d
  1. 2
      epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java
  2. 3
      epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java
  3. 2
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GovTopicIssueInfoResultDTO.java
  4. 4
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
  5. 2
      epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

2
epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/GovTopicOfIssueInfoResultDTO.java

@ -32,7 +32,7 @@ public class GovTopicOfIssueInfoResultDTO implements Serializable {
/** /**
* 话题发表人山东路168-尹女士 * 话题发表人山东路168-尹女士
*/ */
private String publishedUser; private String topicPublisher;
/** /**
* 话题发表时间 (时间戳 毫秒级) * 话题发表时间 (时间戳 毫秒级)

3
epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueManageController.java

@ -119,6 +119,7 @@ public class IssueManageController {
* @date 2020.05.14 13:57 * @date 2020.05.14 13:57
**/ **/
@PostMapping(value = "votingissuelist") @PostMapping(value = "votingissuelist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_VOTINGLIST)
public Result<List<VotingIssueListResultDTO>> votingList( @RequestBody CommonIssueListFormDTO issueListFormDTO){ public Result<List<VotingIssueListResultDTO>> votingList( @RequestBody CommonIssueListFormDTO issueListFormDTO){
ValidatorUtils.validateEntity(issueListFormDTO); ValidatorUtils.validateEntity(issueListFormDTO);
return new Result<List<VotingIssueListResultDTO>>().ok(issueService.votingList(issueListFormDTO)); return new Result<List<VotingIssueListResultDTO>>().ok(issueService.votingList(issueListFormDTO));
@ -132,6 +133,7 @@ public class IssueManageController {
* @date 2020.05.14 13:58 * @date 2020.05.14 13:58
**/ **/
@PostMapping(value = "closedlist") @PostMapping(value = "closedlist")
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_CLOSED_LIST)
public Result<List<ClosedIssueListResultDTO>> closedList( @RequestBody CommonIssueListFormDTO issueListFormDTO){ public Result<List<ClosedIssueListResultDTO>> closedList( @RequestBody CommonIssueListFormDTO issueListFormDTO){
ValidatorUtils.validateEntity(issueListFormDTO); ValidatorUtils.validateEntity(issueListFormDTO);
return new Result<List<ClosedIssueListResultDTO>>().ok(issueService.closedList(issueListFormDTO)); return new Result<List<ClosedIssueListResultDTO>>().ok(issueService.closedList(issueListFormDTO));
@ -144,6 +146,7 @@ public class IssueManageController {
* @author wangc * @author wangc
* @date 2020.05.15 00:19 * @date 2020.05.15 00:19
**/ **/
@RequirePermission(requirePermission = RequirePermissionEnum.WORK_GRASSROOTS_ISSUE_DETAIL)
@PostMapping(value = "votingissuedetail") @PostMapping(value = "votingissuedetail")
public Result<GovIssueDetailResultDTO> votingissuedetail(@RequestBody IssueDetailFormDTO issueDetail){ public Result<GovIssueDetailResultDTO> votingissuedetail(@RequestBody IssueDetailFormDTO issueDetail){
ValidatorUtils.validateEntity(issueDetail); ValidatorUtils.validateEntity(issueDetail);

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

@ -33,7 +33,7 @@ public class GovTopicIssueInfoResultDTO implements Serializable {
/** /**
* 话题发表人山东路168-尹女士 * 话题发表人山东路168-尹女士
*/ */
private String publishedUser; private String topicPublisher;
/** /**
* 话题发表时间 (时间戳 毫秒级) * 话题发表时间 (时间戳 毫秒级)

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

@ -1102,12 +1102,12 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
ResiGroupMemberInfoRedisDTO topicCreator = ResiGroupMemberInfoRedisDTO topicCreator =
resiGroupMemberRedis.get(topic.getGroupId(), topic.getCreatedBy()); resiGroupMemberRedis.get(topic.getGroupId(), topic.getCreatedBy());
if (null != topicCreator) { if (null != topicCreator) {
result.setPublishedUser(StringUtils.isBlank(topicCreator.getUserShowName()) result.setTopicPublisher(StringUtils.isBlank(topicCreator.getUserShowName())
? ModuleConstant.EMPTY_STR : topicCreator.getUserShowName()); ? ModuleConstant.EMPTY_STR : topicCreator.getUserShowName());
result.setTopicPublisherMobile(StringUtils.isBlank(topicCreator.getMemberMobile()) result.setTopicPublisherMobile(StringUtils.isBlank(topicCreator.getMemberMobile())
? ModuleConstant.EMPTY_STR : topicCreator.getMemberMobile()); ? ModuleConstant.EMPTY_STR : topicCreator.getMemberMobile());
} else { } else {
result.setPublishedUser(ModuleConstant.EMPTY_STR); result.setTopicPublisher(ModuleConstant.EMPTY_STR);
result.setTopicPublisherMobile(ModuleConstant.EMPTY_STR); result.setTopicPublisherMobile(ModuleConstant.EMPTY_STR);
} }
//4.话题发表时间格式转换 //4.话题发表时间格式转换

2
epmet-module/resi-hall/resi-hall-server/src/main/java/com/epmet/controller/IssueController.java

@ -192,7 +192,7 @@ public class IssueController {
* @date 2020.05.14 13:57 * @date 2020.05.14 13:57
**/ **/
@PostMapping("votinglist") @PostMapping("votinglist")
public Result<List<VotingIssueListResultDTO>> votingList(CommonIssueListFormDTO issueListFormDTO){ public Result<List<VotingIssueListResultDTO>> votingList(@RequestBody CommonIssueListFormDTO issueListFormDTO){
ValidatorUtils.validateEntity(issueListFormDTO); ValidatorUtils.validateEntity(issueListFormDTO);
return govIssueFeignClient.votingList(issueListFormDTO); return govIssueFeignClient.votingList(issueListFormDTO);
} }

Loading…
Cancel
Save