From 81ab5393edbb9a7d54b870f5ec28f6ee2ed03d04 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 10 Sep 2021 18:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=BE=BD=E7=AB=A0=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=AD=98=E5=82=A8messageTy?= =?UTF-8?q?pe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constant/UserMessageTypeConstant.java | 7 +++++++ .../epmet/service/impl/UserBadgeServiceImpl.java | 15 ++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java index 0568d85281..cb1efc77b5 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/UserMessageTypeConstant.java @@ -184,4 +184,11 @@ public interface UserMessageTypeConstant { * act_user_relation.id */ String HEART_SIGIN_UP_RES="heart_sigin_up_res"; + + + /** + * 居民端提交徽章认证申请 + * user_badge_certificate_record.id todo + */ + String BADGE_AUTH_APPLY="badge_auth_apply"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 0716978c1c..b8f35a0d4a 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; @@ -12,6 +13,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constant.BadgeConstant; import com.epmet.constant.ReadFlagConstant; import com.epmet.constant.SmsTemplateConstant; +import com.epmet.constant.UserMessageTypeConstant; import com.epmet.dao.*; import com.epmet.dto.ResiUserBadgeDTO; import com.epmet.dto.UserBadgeCertificateRecordDTO; @@ -53,8 +55,6 @@ public class UserBadgeServiceImpl implements UserBadgeService { @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @Autowired - private EpmetMessageOpenFeignClient messageFeignClient; - @Autowired private UserRoleDao userRoleDao; @Autowired private ResiUserBadgeDao resiUserBadgeDao; @@ -278,11 +278,10 @@ public class UserBadgeServiceImpl implements UserBadgeService { form.setSurname(certificationAddFormDTO.getSurname()); log.info(JSON.toJSONString(form)); userBadgeDao.insertUserBadgeCertificateRecord(form); - //TODO 站内信发送 String badgeName = badgeDao.selectBadgeName(form.getCustomerId(), form.getBadgeId()); String msg = String.format(BadgeConstant.MESSAGE_CONTENT, userBaseInfoResultDTOS.get(NumConstant.ZERO).getDistrict().concat(userBaseInfoResultDTOS.get(NumConstant.ZERO).getRealName()), badgeName); - sendMessage(BadgeConstant.AUTH_TITLE,msg,form.getGridId(),form.getUserId(),form.getCustomerId()); + sendMessage(BadgeConstant.AUTH_TITLE,msg,form.getGridId(),form.getUserId(),form.getCustomerId(), UserMessageTypeConstant.BADGE_AUTH_APPLY); return new Result(); } @@ -443,7 +442,7 @@ public class UserBadgeServiceImpl implements UserBadgeService { * @author zxc * @date 2020/11/19 上午9:16 */ - public void sendMessage(String title,String msg,String gridId,String userId,String customerId){ + public void sendMessage(String title,String msg,String gridId,String userId,String customerId,String messageType){ //1.查询加入当前网格下的人员 customer_staff_grid CommonGridIdFormDTO commonGridIdFormDTO = new CommonGridIdFormDTO(); commonGridIdFormDTO.setGridId(gridId); @@ -474,6 +473,12 @@ public class UserBadgeServiceImpl implements UserBadgeService { msgObj.setReadFlag(ReadFlagConstant.UN_READ); msgObj.setTitle(title); msgObj.setUserId(to); + + //21.09.10:记录消息类型和对应的业务id + msgObj.setMessageType(messageType); + //todo + msgObj.setTargetId(StrConstant.EPMETY_STR); + msgList.add(msgObj); //微信订阅 WxSubscribeMessageFormDTO subscribeDTO = new WxSubscribeMessageFormDTO();