From 927dadd6d20319abe708d7370af27549a6049bfa Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 19 Jul 2021 10:23:01 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../db/migration/V0.0.5__add_tag_color.sql    | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.5__add_tag_color.sql

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.5__add_tag_color.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.5__add_tag_color.sql
new file mode 100644
index 0000000000..fad88adfab
--- /dev/null
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.5__add_tag_color.sql
@@ -0,0 +1,37 @@
+#添加标签颜色字段
+ALTER TABLE `epmet_gov_voice`.`tag_default`
+    ADD COLUMN `TAG_COLOR` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '标签颜色' AFTER `TAG_NAME`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`ID`) USING BTREE;
+ALTER TABLE `epmet_gov_voice`.`tag_customer`
+    ADD COLUMN `TAG_COLOR` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '标签颜色' AFTER `TAG_NAME`,
+    DROP PRIMARY KEY,
+    ADD PRIMARY KEY (`ID`) USING BTREE;
+#给默认标签添加颜色
+update tag_default set tag_color='#E3271C' where id='6dd39a3dab9011ea8c52c03fd56f7847';
+update tag_default set tag_color='#FB7900' where id='6dd55595ab9011ea8c52c03fd56f7847';
+update tag_default set tag_color='#FFC100' where id='6dd6c2eeab9011ea8c52c03fd56f7847';
+update tag_default set tag_color='#0089FF' where id='6dd804d1ab9011ea8c52c03fd56f7847';
+update tag_default set tag_color='#17B886' where id='6dda6acaab9011ea8c52c03fd56f7847';
+
+#给已有的客户默认标签 添加统一的颜色
+update tag_customer set tag_color='#E3271C' where TAG_NAME='发现榜样';
+update tag_customer set tag_color='#FB7900' where TAG_NAME='党建动态';
+update tag_customer set tag_color='#FFC100' where TAG_NAME='通知公告';
+update tag_customer set tag_color='#0089FF' where TAG_NAME='生活服务';
+update tag_customer set tag_color='#17B886' where TAG_NAME='党建要闻';
+
+#手动去执行
+#获取有哪些客户的标签需要赋值颜色
+# SELECT CUSTOMER_ID ,COUNT(ID) c FROM tag_customer where tag_color IS NULL GROUP BY CUSTOMER_ID;
+#按照时间顺序 依次更新5个颜色
+# update tag_customer set tag_color='#E3271C' where tag_color is null and customer_id = '上面sql客户Id' order by created_time desc limit 1;
+# update tag_customer set tag_color='#FB7900' where tag_color is null and customer_id = '上面sql客户Id' order by created_time desc limit 1;
+# update tag_customer set tag_color='#FFC100' where tag_color is null and customer_id = '上面sql客户Id' order by created_time desc limit 1;
+# update tag_customer set tag_color='#0089FF' where tag_color is null and customer_id = '上面sql客户Id' order by created_time desc limit 1;
+# update tag_customer set tag_color='#17B886' where tag_color is null and customer_id = '上面sql客户Id' order by created_time desc limit 1;
+
+
+
+
+

From 27718028ccfb1ac3cb22a4dae7439c93381195bb Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 19 Jul 2021 10:40:36 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E3=80=90=E4=B8=93=E9=A2=98=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91=E5=B7=B2=E6=9C=89=E4=B8=93=E9=A2=98=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E8=BF=94=E5=8F=82=E5=A2=9E=E5=8A=A0tagColor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/WorkSpecialSubjectResultDTO.java    | 5 +++++
 .../src/main/resources/mapper/SpecialSubjectDao.xml          | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/WorkSpecialSubjectResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/WorkSpecialSubjectResultDTO.java
index d82e148a93..823ecbed6a 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/WorkSpecialSubjectResultDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/WorkSpecialSubjectResultDTO.java
@@ -23,6 +23,11 @@ public class WorkSpecialSubjectResultDTO implements Serializable {
      */
     private String tagName;
 
+    /**
+     * 标签颜色
+     */
+    private String tagColor;
+
     /**
      * true代表可以删除。false不可删除，隐藏减号
      */
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml
index 706460004d..4cd83f8b3a 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/SpecialSubjectDao.xml
@@ -11,7 +11,8 @@
     <select id="queryExistedList" parameterType="map" resultType="com.epmet.dto.SpecialSubjectDTO">
         SELECT
             ss.*,
-            tc.TAG_NAME AS tagName
+            tc.TAG_NAME AS tagName,
+            tc.TAG_COLOR as tagColor
         FROM
             special_subject ss
             INNER JOIN tag_customer tc ON ( ss.CUSTOMER_ID = tc.CUSTOMER_ID AND ss.TAG_ID = tc.id )

From e57ecdb874725d071765edd388e2d7108eb2680a Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 19 Jul 2021 13:38:08 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=93=E9=A2=98=E6=96=B0=E5=A2=9E3?=
 =?UTF-8?q?=E4=B8=AA=E6=9D=83=E9=99=90key?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/commons/tools/enums/RequirePermissionEnum.java    | 6 ++++++
 .../java/com/epmet/controller/SpecialSubjectController.java | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
index 8c8fd0dab3..831913de5e 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java
@@ -126,6 +126,12 @@ public enum RequirePermissionEnum {
     WORK_PARTY_VOICE_EDIT("work_party_voice_edit", "党建声音:重新编辑", ""),
     WORK_PARTY_VOICE_OFFLINE("work_party_voice_offline", "党建声音:下线文章", ""),
     WORK_PARTY_VOICE_OPERATION_LIST("work_party_voice_operation_list","党建声音:查看文章操作记录",""),
+    /**
+     * 党务工作-专题管理
+     */
+    WORK_SPECIAL_PROJECT_ENTRANCE("work_special_project_entrance","专题管理:功能入口图标","专题管理:图标入口"),
+    WORK_SPECIAL_PROJECT_ADD("work_special_project_add","专题管理:新增专题","专题管理:新增专题"),
+    WORK_SPECIAL_PROJECT_DEL("work_special_project_del","专题管理:移除专题","专题管理:移除专题"),
 
     /**
      * 基层治理-支部管理
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java
index 315a0e54cf..1a55bdf7e6 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/SpecialSubjectController.java
@@ -18,6 +18,8 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -56,6 +58,7 @@ public class SpecialSubjectController {
      * @description 添加专题
      * @Date 2021/7/15 15:31
      **/
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_SPECIAL_PROJECT_ADD)
     @PostMapping("add")
     public Result<AddSpecialSubjectResultDTO> addSpecialSubject(@LoginUser TokenDto tokenDto, @RequestBody AddSpecialSubjectFormDTO formDTO) {
         formDTO.setAddUserId(tokenDto.getUserId());
@@ -71,6 +74,7 @@ public class SpecialSubjectController {
      * @description 【专题管理】删除专题
      * @Date 2021/7/15 20:49
      **/
+    @RequirePermission(requirePermission = RequirePermissionEnum.WORK_SPECIAL_PROJECT_DEL)
     @PostMapping("del")
     public Result delSpecialSubject(@LoginUser TokenDto tokenDto, @RequestBody DelSpecialSubjectFormDTO formDTO){
         formDTO.setUserId(tokenDto.getUserId());

From 47f89e359320a6e443b44c11c0c067fe4347f7f0 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Mon, 19 Jul 2021 13:52:25 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=B8=93=E9=A2=98=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E7=83=AD=E9=97=A8=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/TagInfoResultDTO.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/TagInfoResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/TagInfoResultDTO.java
index a547af8767..1c63a56c9f 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/TagInfoResultDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/TagInfoResultDTO.java
@@ -24,4 +24,9 @@ public class TagInfoResultDTO implements Serializable {
      * 标签名称
      */
     private String tagName;
+
+    /**
+     * 标签颜色
+     */
+    private String tagColor;
 }