Merge remote-tracking branch 'origin/dev_ic_diaodong' into dev

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java

@@ -355,6 +355,7 @@ public interface DataStatsDao {
                                                                          @Param("configIds") List<String> configIds);
 
     List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(@Param("gridPids") String gridPids,
+                                                                           @Param("orgId")String orgId,
                                                                            @Param("dateId") String dateId,
                                                                            @Param("configIds") List<String> configIds);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java

@@ -283,5 +283,5 @@ public interface DataStatsService {
 
     List<FactIcuserCategoryAnalysisDailyDTO> queryGridIcUserCategoryData(String orgId, String dateId, List<String> configIds);
 
-    List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(String gridPids, String dateId, List<String> configIds);
+    List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List<String> configIds);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -2181,10 +2181,10 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
     }
 
     @Override
-    public List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(String gridPids, String dateId, List<String> configIds) {
+    public List<FactIcuserCategoryAnalysisDailyDTO> queryAgencyIcUserCategoryData(String gridPids, String orgId,String dateId, List<String> configIds) {
-        if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(gridPids)){
+        if(CollectionUtils.isEmpty(configIds)||StringUtils.isBlank(orgId)){
             return new ArrayList<>();
         }
-        return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,dateId,configIds);
+        return dataStatsDao.queryAgencyIcUserCategoryData(gridPids,orgId,dateId,configIds);
     }
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -33,7 +33,6 @@ import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
 import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity;
 import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity;
-import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
@@ -787,7 +786,7 @@ public class EpmetUserServiceImpl implements EpmetUserService {
                     });
                 }
             }else if(OrgInfoConstant.AGENCY.equals(formDTO.getOrgType())){
-                CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId());
+                /*CustomerAgencyEntity agencyEntity=govOrgService.getAgencyInfo(formDTO.getOrgId());
                 String gridPids="";
                 if(NumConstant.ZERO_STR.equals(agencyEntity.getPid())){
                     // 当前组织是根组织
@@ -799,8 +798,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
                     }else{
                         gridPids=agencyEntity.getPids().concat(StrConstant.COLON).concat(formDTO.getOrgId());
                     }
-                }
+                }*/
-                List<FactIcuserCategoryAnalysisDailyDTO> list = dataStatsService.queryAgencyIcUserCategoryData(gridPids, formDTO.getDateId(), configIds);
+                List<FactIcuserCategoryAnalysisDailyDTO> list = dataStatsService.queryAgencyIcUserCategoryData(null, formDTO.getOrgId(), formDTO.getDateId(), configIds);
                 if(CollectionUtils.isNotEmpty(list)){
                     Map<String, FactIcuserCategoryAnalysisDailyDTO> configMap = list.stream().collect(Collectors.toMap(FactIcuserCategoryAnalysisDailyDTO::getConfigId, m -> m, (k1, k2) -> k1));
                     resList.forEach(resDto->{

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml

@@ -1134,7 +1134,10 @@
         WHERE
             m.DATE_ID = #{dateId}
             AND m.DEL_FLAG = '0'
-            AND m.PIDS LIKE concat(#{gridPids},'%')
+            <if test="gridPids != null and gridPids != '' ">
+                AND m.PIDS LIKE concat(#{gridPids},'%')
+            </if>
+            AND m.pids like concat('%',#{orgId},'%')
             AND M.ORG_TYPE='grid'
             <if test='null!=configIds and configIds.size()>0'>
                 <foreach collection="configIds" item="configId" open="AND (" close=")" separator=" OR ">