Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -96,7 +96,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         List<DimGridEntity> orgList = dimGridService.getGridListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
             log.warn("抽取【公众参与-人均议题】，获取组织数据失败");
-            throw new RenException("抽取【公众参与-人均议题】，获取组织数据失败");
+            return;
         }
         //构建组织数据
         Map<String, ScreenUserJoinEntity> insertMap = new HashMap<>();
@@ -172,7 +172,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         List<DimAgencyEntity> orgList = dimAgencyService.getAgencyListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
             log.warn("抽取【公众参与-人均议题】，获取组织数据失败");
-            throw new RenException("抽取【公众参与-人均议题】，获取组织数据失败");
+            return;
         }
         //构建组织数据
         Map<String, ScreenUserJoinEntity> insertMap = new HashMap<>();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java

@@ -233,13 +233,15 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
         }catch (Exception e){
             log.error("党建引领抽取到大屏失败，参数为："+ JSON.toJSONString(formDTO), e);
         }
-
-        //基层治理 - 热心市民 screen_party_user_rank_data
-        ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
-        param.setCustomerId(customerId);
-        param.setDateId(monthId);
-        screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
-
+        try {
+            //基层治理 - 热心市民 screen_party_user_rank_data
+            ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+            param.setCustomerId(customerId);
+            param.setDateId(monthId);
+            screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
+        }catch(Exception e){
+            log.error("大屏热心市民/党员得分数据写入失败，参数为：{}",JSON.toJSONString(formDTO));
+        }
         //此方法保持在最后即可   计算指标分数 todo 优化 手动创建线程池 控制任务数量
         ExecutorService pool = Executors.newSingleThreadExecutor();
         pool.submit(() -> {