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

# Conflicts:
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
#	epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
#	epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/result/OrgStaffDTO.java

@@ -0,0 +1,29 @@
+package com.epmet.dto.org.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 返回每个网格、每个组织下，工作人员的userId
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/6/3 9:49
+ */
+@Data
+public class OrgStaffDTO implements Serializable {
+
+    /**
+     * 组织id或者网格id
+     */
+    private String orgId;
+    /**
+     * agency or grid
+     */
+    private String orgType;
+    /**
+     * 当前组织或者当前网格下的：
+     */
+    private List<String> staffIds;
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java

@@ -119,6 +119,8 @@ public class DemoController {
     private FactGridGovernDailyService factGridGovernDailyService;
     @Autowired
     private FactAgencyGovernDailyService factAgencyGovernDailyService;
+    @Autowired
+    private ScreenCentralZoneDataAbsorptionService screenCentralZoneDataAbsorptionService;
 
     @GetMapping("testAlarm")
     public void testAlarm() {
@@ -929,4 +931,9 @@ public class DemoController {
         return new Result();
     }
 
+    @PostMapping("centralZoneDataHub")
+    public Result Test(@RequestBody ScreenCentralZoneDataFormDTO param){
+        screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
+        return new Result();
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java

@@ -3,6 +3,7 @@ package com.epmet.dao.org;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.entity.org.CustomerAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -43,4 +44,12 @@ public interface StatsCustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
      */
     CustomerAgencyEntity selectByDeptId(String deptId);
+
+    /**
+     * 获取每个组织、每个网格下工作人员userId集合
+     *
+     * @param customerId
+     * @return com.epmet.dto.org.result.OrgStaffResultDTO
+     */
+    List<OrgStaffDTO> selectOrgStaffIds(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/user/UserDao.java

@@ -141,5 +141,13 @@ public interface UserDao {
      * @date 2021.03.08 17:16
      */
     List<ScreenProjectDataDTO> selectScreenProjectData(@Param("list") List<ScreenProjectDataDTO> list);
+
+    /**
+     * 根据工作员用户id, 返回这些人当中多少个网格员
+     *
+     * @param staffIds
+     * @return int
+     */
+    int selectGridManagerTotal(@Param("customerId")String customerId,@Param("staffIds")List<String> staffIds);
 }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenUserTotalDataEntity.java

@@ -95,4 +95,8 @@ public class ScreenUserTotalDataEntity extends BaseEpmetEntity {
      */
 	private Integer projectTotal;
 
+	/**
+	 * 06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
+	 */
+	private Integer gridMemberTotal;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java

@@ -1,6 +1,7 @@
 package com.epmet.service.org;
 
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.entity.org.CustomerAgencyEntity;
 
 import java.util.Date;
@@ -39,4 +40,12 @@ public interface CustomerAgencyService {
      * @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
      */
     CustomerAgencyEntity getAgencyByDeptId(String deptId);
+
+    /**
+     * 获取每个组织、每个网格下工作人员userId集合
+     *
+     * @param customerId
+     * @return com.epmet.dto.org.result.OrgStaffResultDTO
+     */
+    List<OrgStaffDTO> queryOrgStaffIds(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java

@@ -4,6 +4,7 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.org.StatsCustomerAgencyDao;
 import com.epmet.dto.org.result.CustomerAreaCodeResultDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.entity.org.CustomerAgencyEntity;
 import com.epmet.service.org.CustomerAgencyService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -77,4 +78,16 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
     public CustomerAgencyEntity getAgencyByDeptId(String deptId) {
         return customerAgencyDao.selectByDeptId(deptId);
     }
+
+    /**
+     * 获取每个组织、每个网格下工作人员userId集合
+     *
+     * @param customerId
+     * @return com.epmet.dto.org.result.OrgStaffResultDTO
+     */
+    @Override
+    public List<OrgStaffDTO> queryOrgStaffIds(String customerId) {
+        List<OrgStaffDTO> resultList=customerAgencyDao.selectOrgStaffIds(customerId);
+        return resultList;
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/ScreenCentralZoneDataExtractServiceImpl.java

@@ -4,14 +4,16 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
-import com.epmet.dao.stats.*;
+import com.epmet.dao.stats.FactAgencyProjectDailyDao;
+import com.epmet.dao.stats.FactGroupGridDailyDao;
+import com.epmet.dao.stats.FactIssueGridDailyDao;
 import com.epmet.dao.stats.topic.FactTopicTotalGridDailyDao;
-
-
-
 import com.epmet.dao.stats.user.FactRegUserGridDailyDao;
+import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenUserTotalDataEntity;
+import com.epmet.service.org.CustomerAgencyService;
 import com.epmet.service.stats.ScreenCentralZoneDataExtractService;
+import com.epmet.service.user.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -43,7 +45,10 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
     private FactIssueGridDailyDao factIssueGridDailyDao;
     @Autowired
     private FactAgencyProjectDailyDao factAgencyProjectDailyDao;
-
+    @Autowired
+    private CustomerAgencyService customerAgencyService;
+    @Autowired
+    private UserService userService;
 
     private final String ORG_LEVEL_AGENCY = "agency";
     private final String ORG_LEVEL_GRID = "grid";
@@ -155,6 +160,10 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
         Map<String,Integer> projectMap = agencyProject.stream().collect(Collectors.toMap(ScreenUserTotalDataEntity::getOrgId,ScreenUserTotalDataEntity::getProjectTotal));
         projectMap.putAll(gridProject.stream().collect(Collectors.toMap(ScreenUserTotalDataEntity::getOrgId,ScreenUserTotalDataEntity::getProjectTotal)));
 
+        //For:06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
+        List<OrgStaffDTO> orgStaffDTOList=customerAgencyService.queryOrgStaffIds(customerId);
+        Map<String,Integer> gridManagerMap=userService.queryOrgGridManager(customerId,orgStaffDTOList);
+
         result.forEach(o -> {
             String orgId = o.getOrgId();
             Integer count = groupMap.get(orgId);
@@ -169,10 +178,14 @@ public class ScreenCentralZoneDataExtractServiceImpl implements ScreenCentralZon
             count = projectMap.get(orgId);
             o.setProjectTotal(null == count ? NumConstant.ZERO : count);
             o.setDataEndTime(dimId);
-        });
-
-
 
+            //For:06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数
+            if(gridManagerMap.containsKey(orgId)){
+                o.setGridMemberTotal(gridManagerMap.get(orgId));
+            }else{
+                o.setGridMemberTotal(NumConstant.ZERO);
+            }
+        });
         return result;
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/UserService.java

@@ -2,6 +2,7 @@ package com.epmet.service.user;
 
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.extract.form.GridHeartedFormDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.user.result.UserStatisticalData;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
@@ -84,4 +85,13 @@ public interface UserService {
      * @date 2021.03.08 17:16
      */
     List<ScreenProjectDataDTO> fillScreenProjectData(List<ScreenProjectDataDTO> list);
+
+    /**
+     * 返回每个组织或者每个网格下的网格员数量
+     *
+     * @param customerId
+     * @param orgStaffDTOList
+     * @return com.epmet.dto.user.OrgGridManagerTotalDTO
+     */
+    Map<String,Integer> queryOrgGridManager(String customerId,List<OrgStaffDTO> orgStaffDTOList);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -8,6 +8,7 @@ import com.epmet.dao.user.UserDao;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.extract.form.GridHeartedFormDTO;
 import com.epmet.dto.extract.result.UserPartyResultDTO;
+import com.epmet.dto.org.result.OrgStaffDTO;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.stats.user.*;
 import com.epmet.dto.stats.user.result.UserStatisticalData;
@@ -755,4 +756,22 @@ public class UserServiceImpl implements UserService {
         return collection;
     }
 
+    /**
+     * 返回每个组织或者每个网格下的网格员数量
+     *
+     * @param customerId
+     * @param orgStaffDTOList
+     * @return com.epmet.dto.user.OrgGridManagerTotalDTO
+     */
+    @Override
+    public Map<String,Integer> queryOrgGridManager(String customerId,List<OrgStaffDTO> orgStaffDTOList) {
+        Map<String,Integer> resultMap=new HashMap<>();
+        for (OrgStaffDTO orgStaffDTO : orgStaffDTOList) {
+            if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(orgStaffDTO.getStaffIds())){
+                resultMap.put(orgStaffDTO.getOrgId(),userDao.selectGridManagerTotal(customerId,orgStaffDTO.getStaffIds()));
+            }
+        }
+        return resultMap;
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql

@@ -0,0 +1,4 @@
+-- 为了平阴大屏，显示网格员数，screen_user_total_data 新增GRID_MEMBER_TOTAL
+
+-- epmet_evaluation_index 、 epmet_data_statistical_display  库执行以下：
+ALTER TABLE screen_user_total_data ADD COLUMN `GRID_MEMBER_TOTAL` INT ( 11 ) NOT NULL DEFAULT '0' COMMENT '06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数' AFTER PROJECT_TOTAL;

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenUserTotalDataDao.xml

@@ -75,6 +75,7 @@
         TOPIC_TOTAL,
         ISSUE_TOTAL,
         PROJECT_TOTAL,
+        GRID_MEMBER_TOTAL,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -97,6 +98,7 @@
             #{item.topicTotal},
             #{item.issueTotal},
             #{item.projectTotal},
+            #{item.gridMemberTotal},
             0,
             0,
             'CRAWLER_ROBOT',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml

@@ -150,4 +150,36 @@
             AND cd.DEL_FLAG = '0'
             )
     </select>
+
+    <resultMap id="OrgStaffResultDTOMap" type="com.epmet.dto.org.result.OrgStaffDTO">
+        <result property="orgId" column="orgId"/>
+        <result property="orgType" column="orgType"/>
+        <collection property="staffIds" ofType="java.lang.String">
+            <result column="staffId"/>
+        </collection>
+    </resultMap>
+
+    <select id="selectOrgStaffIds" parameterType="java.lang.String" resultMap="OrgStaffResultDTOMap">
+        SELECT
+            csg.GRID_ID AS orgId,
+            'grid' AS orgType,
+            csg.USER_ID AS staffId
+        FROM
+            customer_staff_grid csg
+        WHERE
+            csg.DEL_FLAG = '0'
+            AND csg.CUSTOMER_ID = #{customerId}
+         UNION ALL
+        SELECT
+            csa.AGENCY_ID AS orgId,
+            'agency' AS orgType,
+            csa.USER_ID AS staffId
+        FROM
+            customer_staff_agency csa
+        WHERE
+            csa.DEL_FLAG = '0'
+            AND csa.CUSTOMER_ID = #{customerId}
+        ORDER BY
+            orgType asc,orgId ASC
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/user/UserDao.xml

@@ -532,4 +532,29 @@
             user_id = #{project.linkName}
         </foreach>
     </select>
+
+    <!--    根据工作员用户id, 返回这些人当中多少个网格员 -->
+    <select id="selectGridManagerTotal" parameterType="map" resultType="int">
+        SELECT
+            count( 1 )
+        FROM
+            staff_role sr
+        WHERE
+            sr.DEL_FLAG = '0'
+            AND sr.CUSTOMER_ID = #{customerId}
+            AND sr.ROLE_ID IN (
+                SELECT
+                    m.id AS roleId
+                FROM
+                    gov_staff_role m
+                WHERE
+                    m.DEL_FLAG = '0'
+                    AND m.CUSTOMER_ID = #{customerId}
+                AND m.ROLE_KEY = 'grid_manager'
+            )
+        AND sr.STAFF_ID in
+        <foreach collection="staffIds" item="staffId" open="(" close=")" separator=",">
+            #{staffId}
+        </foreach>
+    </select>
 </mapper>