Merge remote-tracking branch 'origin/dev_issue_category' into dev_temp

epmet-module/gov-issue/gov-issue-server/pom.xml

@@ -210,6 +210,10 @@
                 <!--钉钉 机器人地址-->
                 <dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=90782b119f82a5b6bb8e0f819b6a77bbc2102b53aa2d7d2e24fa10b66d580b1c</dingTalk.robot.webHook>
                 <dingTalk.robot.secret>SEC080aac67ff78e79fdaba132aa51e3fb3f6060dec99492feaac82cabf9f8b6a19</dingTalk.robot.secret>
+
+                <!--rocketmq-->
+                <rocketmq.nameserver>192.168.1.130:9876;192.168.1.132:9876</rocketmq.nameserver>
+                <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
         </profile>
         <profile>

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueTagsServiceImpl.java

@@ -163,6 +163,7 @@ public class IssueTagsServiceImpl extends BaseServiceImpl<IssueTagsDao, IssueTag
         IssueCategoryTagResultDTO issueCategoryTagResultDTO = new IssueCategoryTagResultDTO();
         issueCategoryTagResultDTO.setId(entity.getId());
         issueCategoryTagResultDTO.setName(entity.getTagName());
+        issueCategoryTagResultDTO.setIsDisable(entity.getIsDisable());
         dictRedis.addIssueProjectTag(entity.getCustomerId(),entity.getCategoryId(),issueCategoryTagResultDTO);
         return new AddTagResultDTO(entity.getId());
     }

epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml

@@ -137,3 +137,5 @@ shutdown:
     enable: true #是否开启优雅停机
     waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警
 
+rocketmq:
+  name-server: @rocketmq.nameserver@

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueProjectTagDictDao.xml

@@ -42,7 +42,8 @@
         SELECT ID AS tagId,
                TAG_NAME AS name,
                CATEGORY_ID,
-               id
+               id,
+               is_disable
         FROM issue_project_tag_dict
         WHERE DEL_FLAG = 0
             AND