Merge branches 'dev' and 'dev_pyscreen' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_pyscreen

epmet-commons/epmet-commons-rocketmq/pom.xml

@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
-            <version>2.1.1</version>
+            <version>2.0.1</version>
         </dependency>
     </dependencies>
 </project>

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java

@@ -12,10 +12,10 @@ public interface ConsomerGroupConstants {
     /**
      * 初始化客户自定义消费者组
      */
-    String INIT_CUSTOMER_CUSTOMIZE_GROUP = "init_customer_customize_group";
+    String INIT_CUSTOMER_COMPONENTS_GROUP = "init_customer_components_group";
     /**
      * 初始化客户组织机构信息分组
      */
-    String INIT_CUSTOMER_ORG_GROUP = "init_customer_org_group";
+    String INIT_CUSTOMER_ORG_ROLES_GROUP = "init_customer_org_roles_group";
 
 }

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java

@@ -1,5 +1,5 @@
 package com.epmet.commons.rocketmq.constants;
 
 public interface TopicConstants {
-    String INIT_CUSTOMER = "init_customer_topic";
+    String INIT_CUSTOMER = "init_customer";
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgListener.java

@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
  * 监听初始化客户动作，为客户初始化角色列表
  */
 @RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
-        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_ORG_GROUP,
+        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_ORG_ROLES_GROUP,
         messageModel = MessageModel.CLUSTERING,
         selectorExpression = "*")
 @Component

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -175,8 +175,8 @@
        SELECT
         agency.ID AS agencyId,
         agency.ORGANIZATION_NAME AS agencyName,
-        agency.PIDS AS agencyIdPath,
+        IF((agency.PIDS IS NULL) || (TRIM(agency.PIDS) = '')  ,agency.ID,CONCAT(agency.PIDS,':',agency.ID)) AS agencyIdPath,
-        agency.ALL_PARENT_NAME AS agencyNamePath,
+		IF(TRIM(IFNULL(agency.ALL_PARENT_NAME,'')) = ''  ,agency.ORGANIZATION_NAME,CONCAT(agency.ALL_PARENT_NAME,':',agency.ORGANIZATION_NAME)) AS agencyNamePath,
         agency.CUSTOMER_ID AS customerId
     FROM
      CUSTOMER_STAFF_AGENCY staff
@@ -188,12 +188,12 @@
 
     <!-- 查询一个工作人员最近登录的网格以及机关信息 -->
     <select id="selectAgencyAndGridInfoExt" resultType="com.epmet.dto.result.ExtStaffInfoResultDTO">
-    SELECT
+        SELECT
         gridd.GRID_NAME,
         agency.ID AS agencyId,
         agency.ORGANIZATION_NAME AS agencyName,
-        agency.PIDS AS agencyIdPath,
+        IF((agency.PIDS IS NULL) || (TRIM(agency.PIDS) = '')  ,agency.ID,CONCAT(agency.PIDS,':',agency.ID)) AS agencyIdPath,
-        agency.ALL_PARENT_NAME AS agencyNamePath,
+		IF(TRIM(IFNULL(agency.ALL_PARENT_NAME,'')) = ''  ,agency.ORGANIZATION_NAME,CONCAT(agency.ALL_PARENT_NAME,':',agency.ORGANIZATION_NAME)) AS agencyNamePath,
         agency.CUSTOMER_ID AS customerId
     FROM
         CUSTOMER_GRID gridd

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/listener/InitCustomerCustomizeListener.java

@@ -21,7 +21,7 @@ import org.springframework.stereotype.Component;
  * 监听初始化客户动作，为客户初始化角色列表
  */
 @RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
-        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_CUSTOMIZE_GROUP,
+        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_COMPONENTS_GROUP,
         messageModel = MessageModel.CLUSTERING,
         selectorExpression = "*")
 @Component