From 26daa379f8ddab53676ca4504c5c3a74d7c9f6ef Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 26 Aug 2021 10:41:54 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=BD=91=E6=A0=BC=E5=91=98?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/mq/ProjectChangedCustomListener.java    | 11 ++++-------
 .../resources/mapper/org/CustomerStaffGridDao.xml     |  2 +-
 .../src/main/resources/mapper/user/UserDao.xml        |  9 +++++----
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
index 852a5aec52..f62cfe09f8 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java
@@ -2,7 +2,6 @@ package com.epmet.mq;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg;
-import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.RedisKeys;
@@ -12,8 +11,6 @@ import com.epmet.dto.extract.form.ExtractOriginFormDTO;
 import com.epmet.service.evaluationindex.extract.todata.FactOriginExtractService;
 import com.epmet.service.evaluationindex.extract.toscreen.ScreenExtractService;
 import com.epmet.util.DimIdGenerator;
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
@@ -23,7 +20,6 @@ import org.apache.rocketmq.common.message.MessageExt;
 import org.redisson.api.RLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.redis.core.RedisTemplate;
 
 import javax.annotation.PreDestroy;
 import java.util.Date;
@@ -119,11 +115,12 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently
             extractOriginFormDTO.setDateId(dateId);
             Future<?> aBoolean = SpringContextUtils.getBean(FactOriginExtractService.class).submitProjectRelationData(extractOriginFormDTO,null);
             try {
-                aBoolean.get();
+                Object o = aBoolean.get();
+                log.info("submitProjectRelationData result:{}",o);
             } catch (InterruptedException e) {
-                e.printStackTrace();
+                log.error("submitProjectRelationData tread InterruptedException",e);
             } catch (ExecutionException e) {
-                e.printStackTrace();
+                log.error("submitProjectRelationData tread ExecutionException",e);
             }
             if (aBoolean.isDone()){
                 // 指标库，实时数据只更新:【screen_project_data】
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerStaffGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerStaffGridDao.xml
index 75b9aa5b40..0dada73cae 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerStaffGridDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerStaffGridDao.xml
@@ -16,7 +16,7 @@
                 grid.PIDS gridPids
             FROM
                 customer_staff_grid sg
-                LEFT JOIN customer_grid grid ON grid.id = sg.grid_id
+                LEFT JOIN customer_grid grid ON grid.id = sg.grid_id AND grid.DEL_FLAG = '0'
             WHERE
                 sg.del_flag = '0'
 
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
index 936f553485..f6ddac0fef 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml
@@ -588,18 +588,19 @@
           AND sr.CUSTOMER_ID = #{customerId}
     </select>
     <select id="selectUserByRoleKey" resultType="com.epmet.dto.user.result.CustomerStaffDTO">
-       SELECT DISTINCT
-            s.USER_ID,
+       SELECT
             s.*,
             gsr.ROLE_NAME
         FROM
             customer_staff s
-            LEFT JOIN staff_role sr ON sr.STAFF_ID = s.USER_ID
+            LEFT JOIN staff_role sr ON sr.STAFF_ID = s.USER_ID AND sr.DEL_FLAG = '0'
             AND sr.CUSTOMER_ID = s.CUSTOMER_ID
-            LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID
+            LEFT JOIN gov_staff_role gsr ON gsr.ID = sr.ROLE_ID AND gsr.DEL_FLAG = '0'
         WHERE
             s.del_flag = '0'
+            AND gsr.CUSTOMER_ID = #{customerId}
             AND gsr.ROLE_KEY = #{roleKey}
+            GROUP BY s.USER_ID
     </select>
     <select id="selectLastStaffPatrolList" resultType="com.epmet.dto.user.result.StatsStaffPatrolRecordDailyDTO">
         SELECT