Merge branches 'dev' and 'wxz_senseless_deploy' of http://git.elinkit.com.cn:7070/r/epmet-cloud into wxz_senseless_deploy

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/PhoneValidatorUtils.java

@@ -10,7 +10,7 @@ import java.util.regex.Pattern;
  * @Date 2020/4/18 15:04
  */
 public class PhoneValidatorUtils {
-    private static final String REGEX_MOBILE ="((\\+86|0086)?\\s*)((134[0-8]\\d{7})|(((13([0-3]|[5-9]))|(14[5-9])|15([0-3]|[5-9])|(16(2|[5-7]))|17([0-3]|[5-8])|18[0-9]|19(1|[8-9]))\\d{8})|(14(0|1|4)0\\d{7})|(1740([0-5]|[6-9]|[10-12])\\d{7}))";
+    private static final String REGEX_MOBILE ="((\\+86|0086)?\\s*)((134[0-8]\\d{7})|(((13([0-3]|[5-9]))|(14[5-9])|15([0-3]|[5-9])|(16(2|[5-7]))|17([0-3]|[5-8])|18[0-9]|19([0-9]))\\d{8})|(14(0|1|4)0\\d{7})|(1740([0-5]|[6-9]|[10-12])\\d{7}))";
 
     /**
      * 判断是否是手机号
@@ -23,5 +23,9 @@ public class PhoneValidatorUtils {
         }
         return Pattern.matches(REGEX_MOBILE, tel);
     }
+
+    public static void main(String[] args) {
+        System.out.println(isMobile("19353198889"));
+    }
 }
 

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
 					}
 				});
 			}
-			//删除旧数据
+			//删除旧数据 每次删除1000
-			factPartyMemberVanguardAgencyDailyService.deleteDailyData(customerId, dimId.getDateId());
+			Integer effectRow;
-			//批量插入
+			do {
-			factPartyMemberVanguardAgencyDailyService.insertBatch(vanguardList);
+				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());
+			//删除旧数据 每次删除1000
-			//批量插入
+			Integer effectRow;
-			factPartyMemberVanguardGridDailyService.insertBatch(vanguardList);
+			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) {
+    public Integer deleteDailyData(String customerId, String dateId, Integer limit) {
-        baseDao.deleteDailyData(customerId, dateId);
+        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) {
+    public Integer deleteDailyData(String customerId, String dateId, Integer limit) {
-        baseDao.deleteDailyData(customerId, dateId);
+        return baseDao.deleteDailyData(customerId, dateId, limit);
     }
 
 }

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

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

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

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

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

@@ -241,7 +241,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) {
+    public Result<ResiActLiveRecResultDTO> liveRecList(@LoginUser TokenDto tokenDto,@RequestBody Map<String, String> map) {
-        return actLiveRecService.liveRecList(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) {
+    public Result<ResiActLiveRecResultDTO> liveRecList(TokenDto tokenDto,Map<String, String> map) {
-        if (map.get("actId") == null){
+        if (!map.containsKey("actId") || StringUtils.isEmpty(map.get("actId"))) {
-            logger.error("传参中没有活动ID");
+            logger.warn("传参中没有actId,或者actId为空,userId:" + tokenDto.getUserId() + "客户id:" + tokenDto.getCustomerId());
-            throw new RenException("传参中没有活动ID");
+            throw new RenException("actId不能为空");
         }
         // 数据汇总
         ResiActLiveRecResultDTO resultDto = new ResiActLiveRecResultDTO();

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/redis/IssueProjectTagDictRedis.java

@@ -108,9 +108,11 @@ public class IssueProjectTagDictRedis {
         Map<String,List<IssueCategoryTagResultDTO>> result = new HashMap<>();
         //传入的categories不会只包含"其他"这个分类，因为情况下ifOtherOnly为true，直接传入null
         List<IssueCategoryTagResultDTO> _default = poolDao.selectDefault(customerId,ifOtherOnly ? null : category);
-        if(!CollectionUtils.isEmpty(_default)){
+        if (!CollectionUtils.isEmpty(_default)) {
-            result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME,_default);
+            result.put(ModuleConstants.DEFAULT_TAG_CATEGORY_NAME, _default);
-        }else log.error("there is no default tag data in database , customerId : {}",customerId);
+        } else {
+            log.error("there is no default tag data in database , customerId : {},category:{}", customerId, ifOtherOnly ? null : category);
+        }
 
 
         //如果keys集合为空，说明缓存中没有当前客户的标签排行信息，直接进行补偿

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/controller/TopicShareLinkRecordController.java

@@ -1,6 +1,7 @@
 package com.epmet.modules.topic.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.aop.NoRepeatSubmit;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -82,6 +83,7 @@ public class TopicShareLinkRecordController {
      * @date 2020/12/18 上午10:14
      */
     @PostMapping("createurl")
+    @NoRepeatSubmit
     public Result<CreateUrlResultDTO> getCreateUrlId(@RequestBody CreateUrlFormDTO createUrlFormDTO, @LoginUser TokenDto tokenDto){
         ValidatorUtils.validateEntity(createUrlFormDTO, CreateUrlFormDTO.CreateUrlForm.class);
         return new Result<CreateUrlResultDTO>().ok(topicShareLinkRecordService.getCreateUrlId(createUrlFormDTO,tokenDto));