Merge branch 'dev_special_subject' into develop

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","专题管理:移除专题","专题管理:移除专题"),
 
     /**
      * 基层治理-支部管理

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;
 }

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不可删除，隐藏减号
      */

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());

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 )