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

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

@@ -176,6 +176,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
             final CountDownLatch latch = new CountDownLatch(NumConstant.FOUR);
             threadPool.submit(() -> {
                 //党员基本情况screen_cpc_base_data
+                try {
                     try {
                         partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
                     } catch (Exception e) {
@@ -199,12 +200,15 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                             log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                         }
                     }
-
+                } finally {
                     latch.countDown();
                     log.info("extractDaily 1 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
+                }
+
             });
             threadPool.submit(() -> {
                 //公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_party_total_data
+                try {
                     try {
                         publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
                     } catch (Exception e) {
@@ -225,10 +229,13 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                             log.error("基层治理-难点赌点抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
                         }
                     }
+                } finally {
                     latch.countDown();
                     log.info("extractDaily 2 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
+                }
             });
             threadPool.submit(() -> {
+                try {
                     ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
                     param.setCustomerId(customerId);
                     param.setDateId(dateId);
@@ -265,11 +272,14 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                     } catch (Exception e) {
                         log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
                     }
+                } finally {
                     latch.countDown();
                     log.info("extractDaily 3 thread run end ========= dateId:{},customerId:{}", dateId, customerId);
+                }
             });
             threadPool.submit(() -> {
                 //治理能力排行screen_govern_rank_data
+                try {
                     try {
                         governRankDataExtractService.extractGridDataDaily(customerId, dateId);
                     } catch (Exception e) {
@@ -312,8 +322,10 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
                         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);
+                }
             });
             try {
                 latch.await();

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java

@@ -163,7 +163,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         baseDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
         screenProjectImgDataDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
         baseDao.insert(screenProjectDataEntity);
-        saveCategory(param.getCustomerId(), Collections.singletonList(screenProjectDataEntity))
+        saveCategory(param.getCustomerId(), Collections.singletonList(screenProjectDataEntity));
         //插入该项目图片表
         String[] projectImgUrl = item.getProjectImgUrl();
         if (ArrayUtils.isNotEmpty(projectImgUrl)) {
@@ -174,7 +174,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 screenProjectImgDataEntity.setProjectId(item.getProjectId());
                 screenProjectImgDataEntity.setProjectImgUrl(projectImgUrl[i]);
                 screenProjectImgDataEntity.setSort(i);
-                imgList.add(screenProjectImgDataEntity)
+                imgList.add(screenProjectImgDataEntity);
             }
             screenProjectImgDataDao.insertBatch(imgList);
         }
@@ -359,8 +359,12 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 if ("external".equals(categoryEntity.getCustomerType())) {
                     entity.setCategoryCode(categoryEntity.getEpmetCategoryCode());
                     CustomerProjectCategoryDictEntity parent = customerProjectCategoryDictService.getByCategoryCode(parentCustomer.getData(), categoryEntity.getEpmetCategoryCode());
+                    if (null != parent) {
                         entity.setParentCategoryCode(parent.getParentCategoryCode());
                         entity.setLevel(parent.getLevel());
+                    } else {
+                        log.error("未找到对应分类");
+                    }
                 } else {
                     entity.setCategoryCode(categoryEntity.getCategoryCode());
                     entity.setParentCategoryCode(categoryEntity.getParentCategoryCode());