From 808ab3f3b45aead0bed933dd0874fdd0074802fe Mon Sep 17 00:00:00 2001
From: "kuang.yife" <clunt@vip.163.com>
Date: Tue, 4 Jun 2024 10:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/playlet/account/account.html        | 9 +++++++++
 .../resources/templates/system/playlet/account/add.html  | 8 ++++++++
 .../resources/templates/system/playlet/account/edit.html | 8 ++++++++
 .../com/playlet/system/domain/PlayletPublicAccount.java  | 4 ++++
 .../mapper/system/PlayletPublicAccountMapper.xml         | 7 ++++++-
 5 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/playlet-admin/src/main/resources/templates/system/playlet/account/account.html b/playlet-admin/src/main/resources/templates/system/playlet/account/account.html
index b6e5ea3..753f4ad 100644
--- a/playlet-admin/src/main/resources/templates/system/playlet/account/account.html
+++ b/playlet-admin/src/main/resources/templates/system/playlet/account/account.html
@@ -46,6 +46,7 @@
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('playlet:account:edit')}]];
     var removeFlag = [[${@permission.hasPermi('playlet:account:remove')}]];
+    var typeDict = [[${@dict.getType('sys_public_type')}]];
     var prefix = ctx + "system/playlet/account";
 
     $(function() {
@@ -68,6 +69,14 @@
                     field: 'name',
                     title: '公众号名称'
                 },
+                {
+                    field: 'publicType',
+                    title: '类型',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        return $.table.selectDictLabel(typeDict, value);
+                    }
+                },
                 {
                     field: 'introduction',
                     title: '简介',
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/account/add.html b/playlet-admin/src/main/resources/templates/system/playlet/account/add.html
index b00b6b1..0dd9c4b 100644
--- a/playlet-admin/src/main/resources/templates/system/playlet/account/add.html
+++ b/playlet-admin/src/main/resources/templates/system/playlet/account/add.html
@@ -13,6 +13,14 @@
                 <input name="name" class="form-control" type="text">
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">类型：</label>
+            <div class="col-sm-8">
+                <select name="publicType" class="form-control m-b" th:with="type=${@dict.getType('sys_public_type')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                </select>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">简介：</label>
             <div class="col-sm-8">
diff --git a/playlet-admin/src/main/resources/templates/system/playlet/account/edit.html b/playlet-admin/src/main/resources/templates/system/playlet/account/edit.html
index c2ac4c1..99e6413 100644
--- a/playlet-admin/src/main/resources/templates/system/playlet/account/edit.html
+++ b/playlet-admin/src/main/resources/templates/system/playlet/account/edit.html
@@ -13,6 +13,14 @@
                 <input name="name" th:field="*{name}" class="form-control" type="text">
             </div>
         </div>
+        <div class="form-group">
+            <label class="col-sm-3 control-label">消息类型：</label>
+            <div class="col-sm-8">
+                <select name="publicType" class="form-control m-b" th:with="type=${@dict.getType('sys_public_type')}">
+                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{publicType}"></option>
+                </select>
+            </div>
+        </div>
         <div class="form-group">
             <label class="col-sm-3 control-label">简介：</label>
             <div class="col-sm-8">
diff --git a/playlet-system/src/main/java/com/playlet/system/domain/PlayletPublicAccount.java b/playlet-system/src/main/java/com/playlet/system/domain/PlayletPublicAccount.java
index cbcef13..6047fdc 100644
--- a/playlet-system/src/main/java/com/playlet/system/domain/PlayletPublicAccount.java
+++ b/playlet-system/src/main/java/com/playlet/system/domain/PlayletPublicAccount.java
@@ -34,6 +34,10 @@ public class PlayletPublicAccount extends BaseEntity
     @ApiModelProperty(value = "公众号名称")
     private String name;
 
+    @Excel(name = "类型")
+    @ApiModelProperty(value = "类型 例如: 01.男频, 02.女频")
+    private String publicType;
+
     /** 简介 */
     @Excel(name = "简介")
     @ApiModelProperty(value = "简介")
diff --git a/playlet-system/src/main/resources/mapper/system/PlayletPublicAccountMapper.xml b/playlet-system/src/main/resources/mapper/system/PlayletPublicAccountMapper.xml
index 1470f20..6a2c95b 100644
--- a/playlet-system/src/main/resources/mapper/system/PlayletPublicAccountMapper.xml
+++ b/playlet-system/src/main/resources/mapper/system/PlayletPublicAccountMapper.xml
@@ -7,6 +7,7 @@
     <resultMap type="PlayletPublicAccount" id="PlayletPublicAccountResult">
         <result property="id"    column="id"    />
         <result property="name"    column="name"    />
+        <result property="publicType"    column="public_type"    />
         <result property="introduction"    column="introduction"    />
         <result property="authorAlias"    column="author_alias"    />
         <result property="logoUrl"    column="logo_url"    />
@@ -21,7 +22,7 @@
     </resultMap>
 
     <sql id="selectPlayletPublicAccountVo">
-        select id, name, introduction, author_alias, logo_url, address, original_content_count, followers_count, create_by, create_time, update_by, update_time, remark from playlet_public_account
+        select id, name, public_type, introduction, author_alias, logo_url, address, original_content_count, followers_count, create_by, create_time, update_by, update_time, remark from playlet_public_account
     </sql>
 
     <select id="selectPlayletPublicAccountList" parameterType="PlayletPublicAccount" resultMap="PlayletPublicAccountResult">
@@ -31,6 +32,7 @@
             <if test="introduction != null  and introduction != ''"> and introduction = #{introduction}</if>
             <if test="authorAlias != null  and authorAlias != ''"> and author_alias = #{authorAlias}</if>
             <if test="logoUrl != null  and logoUrl != ''"> and logo_url = #{logoUrl}</if>
+            <if test="publicType != null  and publicType != ''"> and public_type = #{publicType}</if>
             <if test="address != null  and address != ''"> and address = #{address}</if>
             <if test="originalContentCount != null "> and original_content_count = #{originalContentCount}</if>
             <if test="followersCount != null "> and followers_count = #{followersCount}</if>
@@ -46,6 +48,7 @@
         insert into playlet_public_account
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="name != null">name,</if>
+            <if test="publicType != null">public_type,</if>
             <if test="introduction != null">introduction,</if>
             <if test="authorAlias != null">author_alias,</if>
             <if test="logoUrl != null">logo_url,</if>
@@ -60,6 +63,7 @@
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
+            <if test="publicType != null">#{publicType},</if>
             <if test="introduction != null">#{introduction},</if>
             <if test="authorAlias != null">#{authorAlias},</if>
             <if test="logoUrl != null">#{logoUrl},</if>
@@ -78,6 +82,7 @@
         update playlet_public_account
         <trim prefix="SET" suffixOverrides=",">
             <if test="name != null">name = #{name},</if>
+            <if test="publicType != null">public_type = #{publicType},</if>
             <if test="introduction != null">introduction = #{introduction},</if>
             <if test="authorAlias != null">author_alias = #{authorAlias},</if>
             <if test="logoUrl != null">logo_url = #{logoUrl},</if>