Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

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

@@ -2054,11 +2054,17 @@ public class DataStatsServiceImpl implements DataStatsService {
             int patrolDurationInteger = 0;
             HashSet set = new HashSet();
             for (CustomerDataManageResultDTO.CustomerDataManage u : patrolEnd) {
-                if (org.getOrgId().equals(u.getOrgId())) {
+                if ("community".equals(agencyGrid.getLevel()) && org.getOrgId().equals(u.getOrgId())) {
                     patroCount += u.getPatrolCount();
                     patrolDurationInteger += u.getPatrolDurationInteger();
                     set.add(u.getStaffId());
                 }
+                if (!"community".equals(agencyGrid.getLevel()) && u.getOrgId().contains(org.getOrgId())) {
+                    patroCount += u.getPatrolCount();
+                    patrolDurationInteger += u.getPatrolDurationInteger();
+                    set.add(u.getStaffId());
+                }
+
             }
             patro = set.size();
             Integer minutes = patrolDurationInteger / 60;

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

@@ -887,7 +887,7 @@
             <choose>
                 <when test='dataType == "agency"'>
                     , agency_id orgId
-                    FROM fact_topic_total_agency_daily
+                    FROM fact_topic_hotdiscuss_agency_daily
                     WHERE del_flag = '0'
                     <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
                         #{id}
@@ -895,7 +895,7 @@
                 </when>
                 <otherwise>
                     , grid_id orgId
-                    FROM fact_topic_total_grid_daily
+                    FROM fact_topic_hotdiscuss_grid_daily
                     WHERE del_flag = '0'
                     <foreach collection="idList" item="id" open="AND grid_id IN (" separator="," close=")">
                         #{id}

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml

@@ -24,7 +24,7 @@
                 date_id dateId, grid_id, staff_id staffId, patrol_total , total_time
                 <choose>
                     <when test='dataType == "agency"'>
-                        , agency_id orgId
+                        , grid_pids orgId
                     </when>
                     <otherwise>
                         , grid_id orgId
@@ -36,8 +36,8 @@
             AND patrol_total > 0
             <choose>
                 <when test='dataType == "agency"'>
-                    <foreach collection="idList" item="id" open="AND agency_id IN (" separator="," close=")">
-                        #{id}
+                    <foreach collection="idList" item="id" open="AND (" close=")" separator=" OR ">
+                        grid_pids like concat('%', #{id}, '%')
                     </foreach>
                 </when>
                 <otherwise>

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

@@ -464,6 +464,8 @@ public class AgencyServiceImpl implements AgencyService {
                     pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COLON));
                 }else if(customerAgencyDTO.getPids().contains(StrConstant.COMMA)){
                     pidList= Arrays.asList(customerAgencyDTO.getPids().split(StrConstant.COMMA));
+                } else if (customerAgencyDTO.getPid().equals(customerAgencyDTO.getPids())) {
+                    pidList.add(customerAgencyDTO.getPids());
                 }
                 if(!CollectionUtils.isEmpty(pidList)){
                     //单客户，存在上级时查询...

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardAgencyDailyDao.java

@@ -37,8 +37,9 @@ public interface FactPartyMemberVanguardAgencyDailyDao extends BaseDao<FactParty
 	 * @date 2021/5/17 17:19
 	 * @param customerId
 	 * @param dateId
+	 * @param limit
 	 * @return int
 	 */
-	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId")  String dateId);
-	
-}
+	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId") String dateId, Integer limit);
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactPartyMemberVanguardGridDailyDao.java

@@ -36,7 +36,8 @@ public interface FactPartyMemberVanguardGridDailyDao extends BaseDao<FactPartyMe
 	 * @date 2021/5/17 17:19
 	 * @param customerId
 	 * @param dateId
+	 * @param limit
 	 * @return int
 	 */
-	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId")  String dateId);
-}
+	int deleteDailyData(@Param("customerId") String customerId, @Param("dateId") String dateId, Integer limit);
+}

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

@@ -6,7 +6,6 @@ import com.epmet.constant.OrgTypeConstant;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
 import com.epmet.dto.stats.DimAgencyDTO;
-import com.epmet.dto.stats.DimGridDTO;
 import com.epmet.entity.stats.DimGridEntity;
 import com.epmet.entity.stats.FactPartyMemberVanguardAgencyDailyEntity;
 import com.epmet.entity.stats.FactPartyMemberVanguardGridDailyEntity;
@@ -16,6 +15,7 @@ import com.epmet.service.stats.*;
 import com.epmet.util.DimIdGenerator;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -191,10 +191,20 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 					}
 				});
 			}
-			//删除旧数据
-			factPartyMemberVanguardAgencyDailyService.deleteDailyData(customerId, dimId.getDateId());
-			//批量插入
-			factPartyMemberVanguardAgencyDailyService.insertBatch(vanguardList);
+			//删除旧数据 每次删除1000
+			Integer effectRow;
+			do {
+				effectRow = factPartyMemberVanguardAgencyDailyService.deleteDailyData(customerId, dimId.getDateId(), NumConstant.ONE_THOUSAND);
+			} while (effectRow != null && effectRow > NumConstant.ZERO);
+
+			//批量插入 每次100
+			if (CollectionUtils.isEmpty(vanguardList)) {
+				log.warn("customerAgencyStats insert list is empty,customerId:{},dateId:{}", customerId, dimId.getDateId());
+			}
+
+			ListUtils.partition(vanguardList, NumConstant.ONE_HUNDRED)
+					.forEach(part -> factPartyMemberVanguardAgencyDailyService.insertBatch(part));
+
 		}
 	}
 	/**
@@ -327,10 +337,19 @@ public class StatsPartyMemberVanguardServiceImpl implements StatsPartyMemberVang
 					}
 				});
 			}
-			//删除旧数据
-			factPartyMemberVanguardGridDailyService.deleteDailyData(customerId, dimId.getDateId());
-			//批量插入
-			factPartyMemberVanguardGridDailyService.insertBatch(vanguardList);
+
+			//删除旧数据 每次删除1000
+			Integer effectRow;
+			do {
+				effectRow = factPartyMemberVanguardGridDailyService.deleteDailyData(customerId, dimId.getDateId(), NumConstant.ONE_THOUSAND);
+			} while (effectRow != null && effectRow > NumConstant.ZERO);
+
+			//批量插入 每次100
+			if (CollectionUtils.isEmpty(vanguardList)){
+				log.warn("customerGridStats insert list is empty,customerId:{},dateId:{}", customerId, dimId.getDateId());
+			}
+			ListUtils.partition(vanguardList, NumConstant.ONE_HUNDRED)
+					.forEach(part -> factPartyMemberVanguardGridDailyService.insertBatch(part));
 		}
 	}
 

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

@@ -99,7 +99,8 @@ public interface FactPartyMemberVanguardAgencyDailyService extends BaseService<F
      * @date 2021/5/17 15:55
      * @param customerId
      * @param dateId
+     * @param limit
      * @return void
      */
-    void deleteDailyData(String customerId, String dateId);
-}
+    Integer deleteDailyData(String customerId, String dateId, Integer limit);
+}

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

@@ -99,7 +99,8 @@ public interface FactPartyMemberVanguardGridDailyService extends BaseService<Fac
      * @date 2021/5/17 15:55
      * @param customerId
      * @param dateId
+     * @param limit
      * @return void
      */
-    void deleteDailyData(String customerId, String dateId);
-}
+    Integer deleteDailyData(String customerId, String dateId, Integer limit);
+}

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

@@ -105,14 +105,15 @@ public class FactPartyMemberVanguardAgencyDailyServiceImpl extends BaseServiceIm
      *
      * @param customerId
      * @param dateId
+     * @param limit
      * @return void
      * @author zhaoqifeng
      * @date 2021/5/17 15:55
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deleteDailyData(String customerId, String dateId) {
-        baseDao.deleteDailyData(customerId, dateId);
+    public Integer deleteDailyData(String customerId, String dateId, Integer limit) {
+        return baseDao.deleteDailyData(customerId, dateId, limit);
     }
 
-}
+}

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

@@ -105,14 +105,15 @@ public class FactPartyMemberVanguardGridDailyServiceImpl extends BaseServiceImpl
      *
      * @param customerId
      * @param dateId
+     * @param limit
      * @return void
      * @author zhaoqifeng
      * @date 2021/5/17 15:55
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void deleteDailyData(String customerId, String dateId) {
-        baseDao.deleteDailyData(customerId, dateId);
+    public Integer deleteDailyData(String customerId, String dateId, Integer limit) {
+        return baseDao.deleteDailyData(customerId, dateId, limit);
     }
 
-}
+}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardAgencyDailyDao.xml

@@ -34,7 +34,8 @@
     </resultMap>
     <delete id="deleteDailyData">
         delete from fact_party_member_vanguard_agency_daily where customer_id = #{customerId} and DATE_ID = #{dateId}
+        limit #{limit}
     </delete>
 
 
-</mapper>
+</mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactPartyMemberVanguardGridDailyDao.xml

@@ -34,7 +34,8 @@
     </resultMap>
     <delete id="deleteDailyData">
         delete from fact_party_member_vanguard_grid_daily where customer_id = #{customerId} and DATE_ID = #{dateId}
+        limit #{limit}
     </delete>
 
 
-</mapper>
+</mapper>

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -235,7 +235,7 @@
             </activation>-->
             <properties>
                 <server.port>8111</server.port>
-                <spring.profiles.active>test</spring.profiles.active>
+                <spring.profiles.active>prod</spring.profiles.active>
 
                 <!-- 数据库配置-->
                 <datasource.druid.url>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/ResiActListController.java

@@ -212,8 +212,8 @@ public class ResiActListController {
      * @Date 13:39 2020-07-21
      **/
     @PostMapping("livereclist")
-    public Result<ResiActLiveRecResultDTO> liveRecList(@RequestBody Map<String, String> map) {
-        return actLiveRecService.liveRecList(map);
+    public Result<ResiActLiveRecResultDTO> liveRecList(@LoginUser TokenDto tokenDto,@RequestBody Map<String, String> map) {
+        return actLiveRecService.liveRecList(tokenDto,map);
     }
 
     /**

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/ActLiveRecService.java

@@ -42,7 +42,7 @@ public interface ActLiveRecService extends BaseService<ActLiveRecEntity> {
      * @Author zhangyong
      * @Date 13:39 2020-07-21
      **/
-    Result<ResiActLiveRecResultDTO> liveRecList(Map<String, String> map);
+    Result<ResiActLiveRecResultDTO> liveRecList(TokenDto tokenDto,Map<String, String> map);
 
     /**
      * 活动-添加实况

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActLiveRecServiceImpl.java

@@ -36,7 +36,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.commons.tools.utils.SendMqMsgUtils;
-import com.epmet.constant.ActMessageConstant;
 import com.epmet.dao.ActLivePicDao;
 import com.epmet.dao.ActLiveRecDao;
 import com.epmet.dto.ActInfoDTO;
@@ -90,10 +89,10 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     private String imgSyncScanMethod;
 
     @Override
-    public Result<ResiActLiveRecResultDTO> liveRecList(Map<String, String> map) {
-        if (map.get("actId") == null){
-            logger.error("传参中没有活动ID");
-            throw new RenException("传参中没有活动ID");
+    public Result<ResiActLiveRecResultDTO> liveRecList(TokenDto tokenDto,Map<String, String> map) {
+        if (!map.containsKey("actId") || StringUtils.isEmpty(map.get("actId"))) {
+            logger.warn("传参中没有actId,或者actId为空,userId:" + tokenDto.getUserId() + "客户id:" + tokenDto.getCustomerId());
+            throw new RenException("actId不能为空");
         }
         // 数据汇总
         ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO();