Merge remote-tracking branch 'origin/dev_pyscreen' 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/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/SubAgencyIndexRankPyFormDTO.java

@@ -6,6 +6,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
+
 /**
  * 描述一下
  *
@@ -35,4 +36,7 @@ public class SubAgencyIndexRankPyFormDTO implements Serializable {
 
     @NotBlank(message = "type不能为空,街道：street;网格：grid")
     private String type;
+
+    @NotBlank(message = "customerId不能为空")
+    private String customerId;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -157,7 +157,8 @@ public class IndexController {
      * @Date 2021/2/28 14:33
      **/
     @PostMapping("subagencyindexrank-py")
-    Result<List<SubAgencyIndexRankResultDTO>> subAgencyIndexRankPy(@RequestBody SubAgencyIndexRankPyFormDTO formDTO) {
+    Result<List<SubAgencyIndexRankResultDTO>> subAgencyIndexRankPy(@RequestHeader("CustomerId") String customerId,@RequestBody SubAgencyIndexRankPyFormDTO formDTO) {
+        formDTO.setCustomerId(customerId);
         ValidatorUtils.validateEntity(formDTO);
         return new Result<List<SubAgencyIndexRankResultDTO>>().ok(indexService.subAgencyIndexRankPy(formDTO));
     }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java

@@ -110,7 +110,10 @@ public interface ScreenIndexDataMonthlyDao{
      * @Description 根据areaCode查询下级指数
      * @author yinzuomei
      */
-    List<SubAgencyIndexRankResultDTO> selectSubStreetByAreaCode(@Param("yearId")String yearId, @Param("areaCode")String areaCode,@Param("topNum") int topNum);
+    List<SubAgencyIndexRankResultDTO> selectSubStreetByAreaCode(@Param("customerId") String customerId,
+                                                                @Param("yearId") String yearId,
+                                                                @Param("areaCode") String areaCode,
+                                                                @Param("topNum") int topNum);
 
     /**
      * @param yearId
@@ -118,5 +121,8 @@ public interface ScreenIndexDataMonthlyDao{
      * @Description 根据areaCode查询网格指数
      * @author yinzuomei
      */
-    List<SubAgencyIndexRankResultDTO> selectSubGridByAreaCode(@Param("yearId")String yearId, @Param("areaCode")String areaCode,@Param("topNum") int topNum);
+    List<SubAgencyIndexRankResultDTO> selectSubGridByAreaCode(@Param("customerId") String customerId,
+                                                              @Param("yearId") String yearId,
+                                                              @Param("areaCode") String areaCode,
+                                                              @Param("topNum") int topNum);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -401,7 +401,7 @@ public class IndexServiceImpl implements IndexService {
         LocalDate now = LocalDate.now().minusMonths(NumConstant.ONE);
         String yearId = String.valueOf(now.getYear());
         if("street".equals(formDTO.getType())){
-            List<SubAgencyIndexRankResultDTO> streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(yearId,formDTO.getAreaCode(),formDTO.getTopNum());
+            List<SubAgencyIndexRankResultDTO> streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum());
             // 小数四舍五入
             streetList.forEach(indexRank -> {
                 indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));
@@ -411,7 +411,7 @@ public class IndexServiceImpl implements IndexService {
             });
             return streetList;
         }
-        List<SubAgencyIndexRankResultDTO> gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(yearId,formDTO.getAreaCode(),formDTO.getTopNum());
+        List<SubAgencyIndexRankResultDTO> gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum());
         // 小数四舍五入
         gridList.forEach(indexRank -> {
             indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility()));

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -299,6 +299,7 @@
         WHERE
                 sca.del_flag = '0'
                 AND sca.PARENT_AREA_CODE=#{areaCode}
+                and sy.CUSTOMER_ID=#{customerId}
         ORDER BY index_total DESC
                 LIMIT #{topNum}
     </select>
@@ -319,6 +320,7 @@
         WHERE
                 scg.del_flag = '0'
                 AND scg.AREA_CODE like CONCAT(#{areaCode},'%')
+                and sy.CUSTOMER_ID=#{customerId}
         ORDER BY index_total DESC
                 LIMIT #{topNum}
     </select>

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,
-        agency.ALL_PARENT_NAME AS agencyNamePath,
+        IF((agency.PIDS IS NULL) || (TRIM(agency.PIDS) = '')  ,agency.ID,CONCAT(agency.PIDS,':',agency.ID)) AS agencyIdPath,
+		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,
-        agency.ALL_PARENT_NAME AS agencyNamePath,
+        IF((agency.PIDS IS NULL) || (TRIM(agency.PIDS) = '')  ,agency.ID,CONCAT(agency.PIDS,':',agency.ID)) AS agencyIdPath,
+		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