From 4601e5fbc00c74b79bab15e75e9a35f92dc5962f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 14 Sep 2021 13:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E8=AE=A4=E8=AF=81=E7=94=B3=E8=AF=B7=EF=BC=8C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95messageType=EF=BC=8CtargetId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/constant/UserMessageTypeConstant.java   |  2 +-
 .../src/main/java/com/epmet/dao/UserBadgeDao.java     |  2 +-
 .../com/epmet/service/impl/UserBadgeServiceImpl.java  | 11 ++++++-----
 .../src/main/resources/mapper/UserBadgeDao.xml        |  7 +++++--
 4 files changed, 13 insertions(+), 9 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 cb1efc77b5..adcea05711 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
@@ -188,7 +188,7 @@ public interface UserMessageTypeConstant {
 
     /**
      * 居民端提交徽章认证申请
-     * user_badge_certificate_record.id todo
+     * user_badge_certificate_record.id
      */
     String BADGE_AUTH_APPLY="badge_auth_apply";
 }
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
index e861249258..0fed169769 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeDao.java
@@ -65,7 +65,7 @@ public interface UserBadgeDao {
      * @author zxc
      * @date 2020/11/4 2:13 下午
      */
-    void insertUserBadgeCertificateRecord(UserBadgeCertificateRecordDTO userBadgeCertificateRecordDTO);
+    int insertUserBadgeCertificateRecord(UserBadgeCertificateRecordDTO userBadgeCertificateRecordDTO);
 
     /**
      * @Description  更新认证徽章记录最新
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 b8f35a0d4a..7a70e3e651 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,7 +2,6 @@ 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;
@@ -281,7 +280,10 @@ public class UserBadgeServiceImpl implements UserBadgeService {
         //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(), UserMessageTypeConstant.BADGE_AUTH_APPLY);
+        // 记录待审核id，和消息类型
+        sendMessage(BadgeConstant.AUTH_TITLE,msg,form.getGridId(),form.getUserId(),form.getCustomerId(),
+                UserMessageTypeConstant.BADGE_AUTH_APPLY,
+                form.getId());
 
         return new Result();
     }
@@ -442,7 +444,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,String messageType){
+    public void sendMessage(String title,String msg,String gridId,String userId,String customerId,String messageType,String userBadgeCertificateRecordId){
         //1.查询加入当前网格下的人员 customer_staff_grid
         CommonGridIdFormDTO commonGridIdFormDTO = new CommonGridIdFormDTO();
         commonGridIdFormDTO.setGridId(gridId);
@@ -476,8 +478,7 @@ public class UserBadgeServiceImpl implements UserBadgeService {
 
                     //21.09.10:记录消息类型和对应的业务id
                     msgObj.setMessageType(messageType);
-                    //todo
-                    msgObj.setTargetId(StrConstant.EPMETY_STR);
+                    msgObj.setTargetId(userBadgeCertificateRecordId);
 
                     msgList.add(msgObj);
                     //微信订阅
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
index 9e00787142..d90ebb3941 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
@@ -170,7 +170,10 @@
     </select>
 
     <!--  徽章审核记录表插入  -->
-    <insert id="insertUserBadgeCertificateRecord">
+    <insert id="insertUserBadgeCertificateRecord" useGeneratedKeys="true" keyColumn="ID" keyProperty="id" parameterType="com.epmet.dto.UserBadgeCertificateRecordDTO">
+        <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
+            select replace(uuid(),'-','') AS ID
+        </selectKey>
         INSERT INTO user_badge_certificate_record (
             ID,
             CUSTOMER_ID,
@@ -197,7 +200,7 @@
         )
         VALUES
         (
-            REPLACE ( UUID(), '-', '' ),
+            #{ID},
             #{customerId},
             #{gridId},
             #{userId},