+ * https://www.renren.io + *
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.commons.tools.exception;
+
+
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.utils.MessageUtils;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * Epmet产品 自定义异常
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+public class EpmetException extends RuntimeException {
+
+ private static final long serialVersionUID = 1L;
+ /**
+ * desc:错误码
+ */
+ protected int code;
+ /**
+ * 显示给客户的消息
+ */
+ protected String msg;
+ /**
+ * 内部消息，用于服务之间传递错误信息，排错用
+ */
+ protected String internalMsg;
+
+ /**
+ * desc:指定错误码异常 外部异常内容为错误码对应的异常
+ * @param code
+ */
+ public EpmetException(int code) {
+ this(code, StrConstant.EPMETY_STR);
+ }
+
+ /**
+ * desc:指定内部错误消息的异常 外部异常内容为错误码对应的异常
+ * @param code
+ * @param internalMsg
+ */
+ public EpmetException(int code, String internalMsg) {
+ super(internalMsg);
+ this.code = code;
+ if (StringUtils.isBlank(internalMsg)) {
+ this.internalMsg = EpmetErrorCode.getMsg(code);
+ if (StringUtils.isBlank(this.internalMsg)) {
+ this.internalMsg = MessageUtils.getMessage(code, internalMsg);
+ }
+ } else {
+ this.internalMsg = internalMsg;
+ }
+ }
+
+ /**
+ * desc：指定错误码 内外部错误消息异常
+ * @param code
+ * @param internalMsg
+ * @param externalMsg
+ */
+ public EpmetException(int code, String internalMsg, String externalMsg) {
+ this(code, internalMsg);
+ this.msg = externalMsg;
+ }
+
+ /**
+ * desc:指定内部消息异常 外部错误码及消息为8000，服务器开小差
+ * @param internalMsg
+ */
+ public EpmetException(String internalMsg) {
+ super(internalMsg);
+ this.code = EpmetErrorCode.SERVER_ERROR.getCode();
+ this.internalMsg = internalMsg;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public String getInternalMsg() {
+ return internalMsg;
+ }
+}
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java
index 73ae4bf6b5..ee1d4da142 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenException.java
@@ -35,11 +35,12 @@ public class RenException extends RuntimeException {
* 内部消息，用于服务之间传递错误信息，排错用
*/
private String internalMsg;
-
+ @Deprecated //已废弃 被EpmetException替代
public RenException(int code) {
this(code, "");
}
+ @Deprecated //已废弃 被EpmetException替代
public RenException(int code, String internalMsg) {
super(internalMsg);
this.code = code;
@@ -53,11 +54,13 @@ public class RenException extends RuntimeException {
}
}
+ @Deprecated //已废弃 被EpmetException替代
public RenException(int code, String internalMsg, String msg, MessageMode mode) {
this(code, internalMsg);
this.msg = msg;
}
+ @Deprecated //已废弃 被EpmetException替代
public RenException(String internalMsg) {
super(internalMsg);
// this.code = ErrorCode.INTERNAL_SERVER_ERROR;
@@ -65,15 +68,12 @@ public class RenException extends RuntimeException {
this.internalMsg = internalMsg;
}
+ @Deprecated //已废弃 被EpmetException替代
public RenException(String internalMsg, String msg) {
this(internalMsg);
this.msg = msg;
}
-
-
-
-
public RenException(int code, String... params) {
this.code = code;
this.internalMsg = EpmetErrorCode.getMsg(code);
diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/AssertUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/AssertUtils.java
index 2f5dcd311a..d060fc5e6a 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/AssertUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/AssertUtils.java
@@ -11,6 +11,7 @@ package com.epmet.commons.tools.validator;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
+import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.ErrorCode;
import com.epmet.commons.tools.exception.RenException;
import org.apache.commons.lang3.StringUtils;
@@ -32,7 +33,7 @@ public class AssertUtils {
public static void isBlank(String str, Integer code, String... params) {
if(code == null){
- throw new RenException(ErrorCode.NOT_NULL, "code");
+ throw new EpmetException(ErrorCode.NOT_NULL, "code");
}
if (StringUtils.isBlank(str)) {
@@ -46,7 +47,7 @@ public class AssertUtils {
public static void isNull(Object object, Integer code, String... params) {
if(code == null){
- throw new RenException(ErrorCode.NOT_NULL, "code");
+ throw new EpmetException(ErrorCode.NOT_NULL, "code");
}
if (object == null) {
@@ -60,7 +61,7 @@ public class AssertUtils {
public static void isArrayEmpty(Object[] array, Integer code, String... params) {
if(code == null){
- throw new RenException(ErrorCode.NOT_NULL, "code");
+ throw new EpmetException(ErrorCode.NOT_NULL, "code");
}
if(ArrayUtil.isEmpty(array)){
@@ -74,7 +75,7 @@ public class AssertUtils {
public static void isListEmpty(List list, Integer code, String... params) {
if(code == null){
- throw new RenException(ErrorCode.NOT_NULL, "code");
+ throw new EpmetException(ErrorCode.NOT_NULL, "code");
}
if(CollUtil.isEmpty(list)){
@@ -88,7 +89,7 @@ public class AssertUtils {
public static void isMapEmpty(Map map, Integer code, String... params) {
if(code == null){
- throw new RenException(ErrorCode.NOT_NULL, "code");
+ throw new EpmetException(ErrorCode.NOT_NULL, "code");
}
if(MapUtil.isEmpty(map)){
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
index 3b03d3768d..74af482075 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
@@ -177,143 +177,155 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
threadPool.submit(() -> {
//党员基本情况screen_cpc_base_data
try {
- partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
- } catch (Exception e) {
- log.error("党员基本情况抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
- //先锋模范screen_pioneer_data
- if (isLast) {
try {
- pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
+ partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
} catch (Exception e) {
- log.error("先锋模范【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ log.error("党员基本情况抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
}
- try {
- pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
- } catch (Exception e) {
- log.error("先锋模范【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
- try {
- pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
- } catch (Exception e) {
- log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ //先锋模范screen_pioneer_data
+ if (isLast) {
+ try {
+ pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
+ } catch (Exception e) {
+ log.error("先锋模范【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
+ try {
+ pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId);
+ } catch (Exception e) {
+ log.error("先锋模范【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
+ try {
+ pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId);
+ } catch (Exception e) {
+ log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
}
+ } finally {
+ latch.countDown();
+ log.info("extractDaily 1 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
}
- latch.countDown();
- log.info("extractDaily 1 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
});
threadPool.submit(() -> {
//公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_party_total_data
try {
- publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
- } catch (Exception e) {
- log.error("公众参与排行抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
- if (isLast) {
- //基层治理- 难点赌点 screen_difficulty_data | screen_difficulty_img_data
try {
- ScreenCentralZoneDataFormDTO param2 = new ScreenCentralZoneDataFormDTO();
- param2.setCustomerId(customerId);
- param2.setDateId(null);
- log.info("【难点赌点数据上报开始------】 当前客户Id{}", param2.getCustomerId());
- //screenGrassrootsGovernDataAbsorptionService.difficultyDataHub(param);
-
- screenGrassrootsGovernDataAbsorptionService.difficultyDataExtract(param2);
- log.info("【难点赌点数据上报结束------】 当前客户Id{}", param2.getCustomerId());
+ publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
} catch (Exception e) {
- log.error("基层治理-难点赌点抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ log.error("公众参与排行抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
+ if (isLast) {
+ //基层治理- 难点赌点 screen_difficulty_data | screen_difficulty_img_data
+ try {
+ ScreenCentralZoneDataFormDTO param2 = new ScreenCentralZoneDataFormDTO();
+ param2.setCustomerId(customerId);
+ param2.setDateId(null);
+ log.info("【难点赌点数据上报开始------】 当前客户Id{}", param2.getCustomerId());
+ //screenGrassrootsGovernDataAbsorptionService.difficultyDataHub(param);
+
+ screenGrassrootsGovernDataAbsorptionService.difficultyDataExtract(param2);
+ log.info("【难点赌点数据上报结束------】 当前客户Id{}", param2.getCustomerId());
+ } catch (Exception e) {
+ log.error("基层治理-难点赌点抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
}
+ } finally {
+ latch.countDown();
+ log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
}
- latch.countDown();
- log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
});
threadPool.submit(() -> {
- ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
- param.setCustomerId(customerId);
- param.setDateId(dateId);
- //中央区 screen_user_total_data
try {
- screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
- } catch (Exception e) {
- log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
+ ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+ param.setCustomerId(customerId);
+ param.setDateId(dateId);
+ //中央区 screen_user_total_data
+ try {
+ screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
+ } catch (Exception e) {
+ log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
- try {
- // 项目(事件)分析按网格_按天统计
- screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId);
- } catch (Exception e) {
- log.error("项目(事件)分析按网格_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
- try {
- // 项目(事件)分析按组织_按天统计
- screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId);
- } catch (Exception e) {
- log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
+ try {
+ // 项目(事件)分析按网格_按天统计
+ screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId);
+ } catch (Exception e) {
+ log.error("项目(事件)分析按网格_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
+ try {
+ // 项目(事件)分析按组织_按天统计
+ screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId);
+ } catch (Exception e) {
+ log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
- //按天统计：网格内各个分类下的项目总数
- try {
- screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId);
- } catch (Exception e) {
- log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
+ //按天统计：网格内各个分类下的项目总数
+ try {
+ screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId);
+ } catch (Exception e) {
+ log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
- // 按天统计：组织内各个分类下的项目总数
- try {
- screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId);
- } catch (Exception e) {
- log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+ // 按天统计：组织内各个分类下的项目总数
+ try {
+ screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId);
+ } catch (Exception e) {
+ log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
+ } finally {
+ latch.countDown();
+ log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
}
- latch.countDown();
- log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
});
threadPool.submit(() -> {
//治理能力排行screen_govern_rank_data
try {
- governRankDataExtractService.extractGridDataDaily(customerId, dateId);
- } catch (Exception e) {
- log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
- try {
- governRankDataExtractService.extractCommunityDataDaily(customerId, dateId);
- } catch (Exception e) {
- log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
- try {
- governRankDataExtractService.extractStreetDataDaily(customerId, dateId);
- } catch (Exception e) {
- log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
- try {
- governRankDataExtractService.extractDistrictDataDaily(customerId, dateId);
- } catch (Exception e) {
- log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
+ try {
+ governRankDataExtractService.extractGridDataDaily(customerId, dateId);
+ } catch (Exception e) {
+ log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
+ try {
+ governRankDataExtractService.extractCommunityDataDaily(customerId, dateId);
+ } catch (Exception e) {
+ log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
+ try {
+ governRankDataExtractService.extractStreetDataDaily(customerId, dateId);
+ } catch (Exception e) {
+ log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
+ try {
+ governRankDataExtractService.extractDistrictDataDaily(customerId, dateId);
+ } catch (Exception e) {
+ log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
- try {
- ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO();
- extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
- extractFactGridGovernDailyFromDTO.setDateId(dateId);
- factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
- } catch (Exception e) {
- log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
+ try {
+ ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO();
+ extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
+ extractFactGridGovernDailyFromDTO.setDateId(dateId);
+ factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
+ } catch (Exception e) {
+ log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
- try {
- factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
- } catch (Exception e) {
- log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
- }
+ try {
+ factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
+ } catch (Exception e) {
+ log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
- try {
- factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
- } catch (Exception e) {
- log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ try {
+ factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
+ } catch (Exception e) {
+ log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
+ }
+ extractPartData(customerId, dateId);
+ } finally {
+ latch.countDown();
+ log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
}
- extractPartData(customerId, dateId);
- latch.countDown();
- log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
});
try {
latch.await();
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index fcdcf05349..e2597eae16 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -352,7 +352,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl