消息模块自测调整

deploy/master/master_sql.sql

@@ -0,0 +1,9 @@
+ALTER TABLE `message_template_event_group`
+    ADD COLUMN `app_id` BIGINT(20) NULL
+        COMMENT '所属应用 ID，对应 sys_app.id'
+        AFTER `template_service_name`;
+-- arg_template_json
+ALTER TABLE `message_template_event_group`
+    ADD COLUMN `arg_template_json` TEXT NULL
+        COMMENT '模板变量 JSON，结构：[{"propertyName":"显示名","propertyKey":"${fieldName}$"}]'
+        AFTER `notice_app_code`;

java/storlead-message/storlead-message-biz/src/main/java/com/storlead/message/service/impl/InsideMessageRecordServiceImpl.java

@@ -107,6 +107,7 @@ public class InsideMessageRecordServiceImpl extends MyBaseServiceImpl<InsideMess
         }
 
         InsideMessageRecordEntity entity = new InsideMessageRecordEntity(title,content,templateEntity.getTemplateIcon(),templateEntity.getTemplateTag(),router,sendUserId,1,eventGroup.getTemplateServiceType());
+        entity.setAppId(eventGroup.getAppId());
         entity.setCreateBy(sendUserId);
         entity.setUpdateBy(sendUserId);
         saveOrUpdate(entity);

java/storlead-message/storlead-message-biz/src/main/resources/mapper/MessageTemplateEventDetailMapper.xml

@@ -17,7 +17,9 @@
 
         <!-- 通用查询结果列 -->
         <sql id="Base_Column_List">
-            id, template_event_id, template_event_name, template_icon,template_tag,template_detail_type, message_title, message_centent, callback_url, remark,<include refid="com.storlead.framework.mybatis.mapper.SysBaseFieldMapper.Base_Column_List"></include>
+            id, template_event_id, template_event_name, template_icon, template_tag, template_detail_type,
+            message_title, message_centent, callback_url, remark,
+            <include refid="com.storlead.framework.mybatis.mapper.SysBaseFieldMapper.Base_Column_List"></include>
         </sql>
 
 </mapper>

java/storlead-message/storlead-message-biz/src/main/resources/mapper/MessageTemplateEventGroupMapper.xml

@@ -6,17 +6,21 @@
         <resultMap id="BaseResultMap" extends="com.storlead.framework.mybatis.mapper.SysBaseFieldMapper.BaseResultMap" type="com.storlead.message.pojo.entity.MessageTemplateEventGroupEntity">
              <id column="id" property="id" />
              <result column="template_service_name" property="templateServiceName" />
+             <result column="app_id" property="appId" />
             <result column="template_service_type" property="templateServiceType" />
              <result column="template_service_code" property="templateServiceCode" />
              <result column="event_name" property="eventName" />
              <result column="event_code" property="eventCode" />
              <result column="event_rule_script" property="eventRuleScript" />
             <result column="receiver_key" property="receiverKey" />
+            <result column="notice_app_code" property="noticeAppCode" />
+            <result column="arg_template_json" property="argTemplateJson" />
         </resultMap>
 
         <!-- 通用查询结果列 -->
         <sql id="Base_Column_List">
-            id, template_service_name, template_service_code, event_name, event_code, event_rule_script,receiver_key,
+            id, template_service_name, app_id, template_service_type, template_service_code, event_name, event_code,
+            event_rule_script, receiver_key, notice_app_code, arg_template_json,
             <include refid="com.storlead.framework.mybatis.mapper.SysBaseFieldMapper.Base_Column_List"></include>
         </sql>
 

java/storlead-message/storlead-message-core/src/main/java/com/storlead/message/pojo/dto/MessageTemplateEventDTO.java

@@ -1,7 +1,7 @@
 package com.storlead.message.pojo.dto;
 
-import com.storlead.framework.common.dto.page.PageDTO;
 import com.storlead.framework.common.dto.query.QueryBaseDTO;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -12,5 +12,10 @@ import lombok.Data;
  */
 @Data
 public class MessageTemplateEventDTO extends QueryBaseDTO {
+
+    @ApiModelProperty(value = "业务模块，对应消息类型")
     private Integer templateServiceType;
+
+    @ApiModelProperty(value = "应用 ID，对应 message_template_event_group.app_id / sys_app.id")
+    private Long appId;
 }

java/storlead-message/storlead-message-core/src/main/java/com/storlead/message/pojo/entity/MessageTemplateEventDetailEntity.java

@@ -37,9 +37,6 @@ public class MessageTemplateEventDetailEntity extends SysBaseField {
     @ApiModelProperty(value = "模板id")
     private Long templateEventId;
 
-    @ApiModelProperty(value = "应用ID")
-    private String appId;
-
     @ApiModelProperty(value = "模板图标")
     private String templateIcon;
 

java/storlead-message/storlead-message-core/src/main/java/com/storlead/message/pojo/entity/MessageTemplateEventGroupEntity.java

@@ -36,8 +36,8 @@ public class MessageTemplateEventGroupEntity extends SysBaseField {
     @ApiModelProperty(value = "模块名称")
     private String templateServiceName;
 
-    @ApiModelProperty(value = "应用ID")
-    private String appId;
+    @ApiModelProperty(value = "应用 ID，对应 sys_app.id")
+    private Long appId;
 
     @ApiModelProperty(value = "业务模块，对应消息类型")
     @Dict(dictCode = "work_data_group",valueField = "templateServiceName")
@@ -61,4 +61,7 @@ public class MessageTemplateEventGroupEntity extends SysBaseField {
     @ApiModelProperty(value = "通知的APPCODE")
     private String noticeAppCode;
 
+    @ApiModelProperty(value = "模板变量配置 JSON，元素结构同 MessageArgTemplateVO：propertyName、propertyKey")
+    private String argTemplateJson;
+
 }