From 3ce8cb3deee599f485dc03f3dd62056ce61a6b66 Mon Sep 17 00:00:00 2001
From: "382696293@qq.com" <382696293@qq.com>
Date: Tue, 26 Dec 2023 14:57:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/domain/entity/WxUserScriptLog.java   | 13 +++++++
 .../enums/WxUserIntegralMessageTypeEnum.java  | 35 +++++++++++++++++++
 .../mapper/WxUserScriptLogMapper.xml          |  7 +++-
 .../impl/WxUserScriptLogServiceImpl.java      |  2 ++
 flossom-ui/src/views/system/member/index.vue  | 13 ++++++-
 5 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/WxUserIntegralMessageTypeEnum.java

diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserScriptLog.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserScriptLog.java
index cc6779a..055a3a5 100644
--- a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserScriptLog.java
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/domain/entity/WxUserScriptLog.java
@@ -23,6 +23,11 @@ public class WxUserScriptLog extends BaseEntity {
      */
     private Long wxUserId;
 
+    /**
+     * 消息类型：0、未知，1、用户注册，2、绑定仪器，3、打卡活动，4、护理计划，5、问卷活动，6、会员管理，7、消息模板
+     */
+    private Integer messageType;
+
     /**
      * 是否已读：0否，1是
      */
@@ -259,4 +264,12 @@ public class WxUserScriptLog extends BaseEntity {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
+    public Integer getMessageType() {
+        return messageType;
+    }
+
+    public void setMessageType(Integer messageType) {
+        this.messageType = messageType;
+    }
 }
diff --git a/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/WxUserIntegralMessageTypeEnum.java b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/WxUserIntegralMessageTypeEnum.java
new file mode 100644
index 0000000..b548f96
--- /dev/null
+++ b/flossom-common/flossom-common-core/src/main/java/com/flossom/common/core/enums/WxUserIntegralMessageTypeEnum.java
@@ -0,0 +1,35 @@
+package com.flossom.common.core.enums;
+
+/**
+ * wx_user_script_log
+ * <p>
+ * 消息类型：0、未知，1、用户注册，2、绑定仪器，3、打卡活动，4、护理计划，5、问卷活动，6、会员管理，7、消息模板
+ */
+public enum WxUserIntegralMessageTypeEnum {
+
+    UNKNOWN(0, "未知"),
+    USER_REGISTRATION(1, "用户注册"),
+    BINDING_INSTRUMENTS(2, "绑定仪器"),
+    CLOCK_ACTIVITIES(3, "打卡活动"),
+    CARE_PLAN(4, "护理计划"),
+    QUESTIONNAIRE_ACTIVITY(5, "问卷活动"),
+    MEMBER_MANAGEMENT(6, "会员管理"),
+    MESSAGE_TEMPLATE(7, "消息模板");
+
+    private final Integer code;
+    private final String info;
+
+    WxUserIntegralMessageTypeEnum(Integer code, String info) {
+        this.code = code;
+        this.info = info;
+    }
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getInfo() {
+        return info;
+    }
+
+}
diff --git a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserScriptLogMapper.xml b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserScriptLogMapper.xml
index 900a32b..e57d80d 100644
--- a/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserScriptLogMapper.xml
+++ b/flossom-common/flossom-common-core/src/main/resources/mapper/WxUserScriptLogMapper.xml
@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="WxUserScriptLog" id="WxUserScriptLogResult">
         <result property="id"    column="id"    />
         <result property="wxUserId"    column="wx_user_id"    />
+        <result property="messageType"    column="message_type"   />
         <result property="isRead"    column="is_read"    />
         <result property="isCustom"    column="is_custom"    />
         <result property="scriptTemplateId"    column="script_template_id"    />
@@ -29,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectWxUserScriptLogVo">
-        select id, wx_user_id, is_read, is_custom, script_template_id, script_name, titile, content, tag_type, type, link, link_params, redirect_appid, redirect_url, video_no, feed_id, tag_names, tag_ids, status, create_by, create_time from wx_user_script_log
+        select id, wx_user_id, message_type, is_read, is_custom, script_template_id, script_name, titile, content, tag_type, type, link, link_params, redirect_appid, redirect_url, video_no, feed_id, tag_names, tag_ids, status, create_by, create_time from wx_user_script_log
     </sql>
 
     <select id="selectWxUserScriptLogList" parameterType="WxUserScriptLog" resultMap="WxUserScriptLogResult">
@@ -37,6 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>  
             <if test="wxUserId != null "> and wx_user_id = #{wxUserId}</if>
             <if test="isRead != null "> and is_read = #{isRead}</if>
+            <if test="messageType != null "> and message_type = #{messageType}</if>
             <if test="isCustom != null "> and is_custom = #{isCustom}</if>
             <if test="scriptTemplateId != null "> and script_template_id = #{scriptTemplateId}</if>
             <if test="scriptName != null  and scriptName != ''"> and script_name like concat('%', #{scriptName}, '%')</if>
@@ -66,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="wxUserId != null">wx_user_id,</if>
             <if test="isRead != null">is_read,</if>
+            <if test="messageType != null">message_type,</if>
             <if test="isCustom != null">is_custom,</if>
             <if test="scriptTemplateId != null">script_template_id,</if>
             <if test="scriptName != null">script_name,</if>
@@ -88,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="wxUserId != null">#{wxUserId},</if>
             <if test="isRead != null">#{isRead},</if>
+            <if test="messageType != null">#{messageType},</if>
             <if test="isCustom != null">#{isCustom},</if>
             <if test="scriptTemplateId != null">#{scriptTemplateId},</if>
             <if test="scriptName != null">#{scriptName},</if>
@@ -113,6 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update wx_user_script_log
         <trim prefix="SET" suffixOverrides=",">
             <if test="wxUserId != null">wx_user_id = #{wxUserId},</if>
+            <if test="messageType != null">message_type = #{messageType},</if>
             <if test="isRead != null">is_read = #{isRead},</if>
             <if test="isCustom != null">is_custom = #{isCustom},</if>
             <if test="scriptTemplateId != null">script_template_id = #{scriptTemplateId},</if>
diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java
index b2620fb..68eec75 100644
--- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java
+++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/WxUserScriptLogServiceImpl.java
@@ -8,6 +8,7 @@ import com.flossom.common.core.domain.entity.SysTag;
 import com.flossom.common.core.domain.entity.WxScriptTemplate;
 import com.flossom.common.core.domain.entity.WxUserScriptLog;
 import com.flossom.common.core.domain.req.WxUserScriptReq;
+import com.flossom.common.core.enums.WxUserIntegralMessageTypeEnum;
 import com.flossom.common.core.mapper.*;
 import com.flossom.common.core.utils.DateUtils;
 import com.flossom.common.core.utils.StringUtils;
@@ -114,6 +115,7 @@ public class WxUserScriptLogServiceImpl implements IWxUserScriptLogService {
             if (wxUserScriptReq.getTagIds() != null && wxUserScriptReq.getTagIds().size() > 0) {
                 wxUserScriptLog.setTagIds(wxUserScriptReq.getTagIds().stream().collect(Collectors.joining(",")));
             }
+            wxUserScriptLog.setMessageType(WxUserIntegralMessageTypeEnum.MEMBER_MANAGEMENT.getCode());
             wxUserScriptLog.setWxUserId(wxUserId);
             wxUserScriptLog.setCreateBy(SecurityUtils.getUsername());
             wxUserScriptLog.setCreateTime(DateUtils.getNowDate());
diff --git a/flossom-ui/src/views/system/member/index.vue b/flossom-ui/src/views/system/member/index.vue
index 3064660..27dc3fe 100644
--- a/flossom-ui/src/views/system/member/index.vue
+++ b/flossom-ui/src/views/system/member/index.vue
@@ -574,7 +574,18 @@
       <template>
         <el-table :data="userScriptLogQuery.userScriptList" :stripe="true" style="width: 100%">
           <el-table-column type="index" width="50"></el-table-column>
-          <el-table-column prop="messageType" label="消息类型" width="100px">后台消息</el-table-column>
+          <el-table-column prop="messageType" label="消息类型" width="100px">
+            <template slot-scope="scope">
+              <span v-show="scope.row.messageType == 0">未知</span>
+              <span v-show="scope.row.messageType == 1">用户注册</span>
+              <span v-show="scope.row.messageType == 2">绑定仪器</span>
+              <span v-show="scope.row.messageType == 3">打卡活动</span>
+              <span v-show="scope.row.messageType == 4">护理计划</span>
+              <span v-show="scope.row.messageType == 5">问卷活动</span>
+              <span v-show="scope.row.messageType == 6">会员管理</span>
+              <span v-show="scope.row.messageType == 7">消息模板</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="titile" label="标题" width="200"></el-table-column>
           <el-table-column prop="content" label="内容"></el-table-column>
           <el-table-column prop="isRead" label="状态" width="100">