Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/person/controller/IssueController.java

@@ -63,7 +63,7 @@ public class IssueController {
      * @author zxc
      * @date 2020/11/11 9:24 上午
      */
-    @PostMapping("my-pub-issues/auditing")
+    @PostMapping("my-pub-issues/voting")
     public Result<List<MyPubIssuesAuditingResultDTO>> myPubIssuesAuditing(@LoginUser TokenDto tokenDto, @RequestBody MyPubIssuesAuditingFormDTO myPubIssuesAuditingFormDTO){
         ValidatorUtils.validateEntity(myPubIssuesAuditingFormDTO, MyPubIssuesAuditingFormDTO.MyPubIssuesAuditing.class);
         return new Result<List<MyPubIssuesAuditingResultDTO>>().ok(issueService.myPubIssuesAuditing(tokenDto,myPubIssuesAuditingFormDTO));

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java

@@ -289,31 +289,6 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         }
     }
 
-    /**
-     * @Description 站内信发送——提交徽章认证
-     * @Param form
-     * @author zxc
-     * @date 2020/11/10 9:04 上午
-     */
-    public void sendMessageByUser(UserBadgeCertificateRecordDTO form) {
-        List<UserMessageFormDTO> msgList = new ArrayList<>();
-        UserMessageFormDTO formDTO = new UserMessageFormDTO();
-        formDTO.setApp(BadgeConstant.RESI);
-        formDTO.setCustomerId(form.getCustomerId());
-        formDTO.setGridId(form.getGridId());
-        UserBadgeListResultDTO userBadgeListResultDTO = userBadgeDao.selectBadgeByBadgeId(form.getCustomerId(), form.getBadgeId());
-        if (null == userBadgeListResultDTO){
-            log.error(BadgeConstant.GET_BADGE_NAME_FAILURE);
-            return;
-        }
-        formDTO.setMessageContent(String.format(BadgeConstant.MESSAGE_CONTENT,userBadgeListResultDTO.getBadgeName()));
-        formDTO.setTitle(BadgeConstant.AUTH_TITLE);
-        formDTO.setReadFlag(BadgeConstant.READ_FLAG);
-        formDTO.setUserId(form.getUserId());
-        msgList.add(formDTO);
-        Result result = messageFeignClient.saveUserMessageList(msgList);
-    }
-
     /**
      * @Description  发送验证码
      * @Param badgeSendCodeFormDTO