elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev_shibei_match
wangxianzhang 4 years ago
parent
466d451cd4 3fe1d719c3
commit
069a9cdeea
7 changed files with 152 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 228
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java
  2. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
  3. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java
  4. 14
      epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java
  5. 16
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
  6. 8
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
  7. 2
      epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java

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

@ -177,143 +177,155 @@ public class ScreenExtractServiceImpl implements ScreenExtractService {
threadPool.submit(() -> { threadPool.submit(() -> {
//党员基本情况screen_cpc_base_data //党员基本情况screen_cpc_base_data
try { try {
partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
} catch (Exception e) {
log.error("党员基本情况抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
}
//先锋模范screen_pioneer_data
if (isLast) {
try { try {
pioneerDataExtractService.extractGridPioneerData(customerId, dateId); partyBaseInfoService.statsPartyMemberBaseInfoToScreen(customerId, dateId);
} catch (Exception e) { } catch (Exception e) {
log.error("先锋模范【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e); log.error("党员基本情况抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
} }
try { //先锋模范screen_pioneer_data
pioneerDataExtractService.extractCommunityPioneerData(customerId, dateId); if (isLast) {
} catch (Exception e) { try {
log.error("先锋模范【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e); pioneerDataExtractService.extractGridPioneerData(customerId, dateId);
} } catch (Exception e) {
try { log.error("先锋模范【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
pioneerDataExtractService.extractExceptCommunityPioneerData(customerId, dateId); }
} catch (Exception e) { try {
log.error("先锋模范【extractExceptCommunityPioneerData】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e); 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(() -> { threadPool.submit(() -> {
//公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_party_total_data //公众参与排行（注册人数、参与人数、话题数、议题数、项目数）screen_public_party_total_data
try { 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 { try {
ScreenCentralZoneDataFormDTO param2 = new ScreenCentralZoneDataFormDTO(); publicPartiTotalDataExtractService.extractPublicPartiTotalData(customerId, dateId);
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) { } 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(() -> { threadPool.submit(() -> {
ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
param.setCustomerId(customerId);
param.setDateId(dateId);
//中央区 screen_user_total_data
try { try {
screenCentralZoneDataAbsorptionService.centralZoneDataHub(param); ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
} catch (Exception e) { param.setCustomerId(customerId);
log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e); param.setDateId(dateId);
} //中央区 screen_user_total_data
try {
screenCentralZoneDataAbsorptionService.centralZoneDataHub(param);
} catch (Exception e) {
log.error("中央区抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
}
try { try {
// 项目(事件)分析按网格_按天统计 // 项目(事件)分析按网格_按天统计
screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId); screenProjectGridDailyService.extractionProjectGridDaily(customerId, dateId);
} catch (Exception e) { } catch (Exception e) {
log.error("项目(事件)分析按网格_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e); log.error("项目(事件)分析按网格_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
} }
try { try {
// 项目(事件)分析按组织_按天统计 // 项目(事件)分析按组织_按天统计
screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId); screenProjectOrgDailyService.extractionProjectOrgDaily(customerId, dateId);
} catch (Exception e) { } catch (Exception e) {
log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e); log.error("项目(事件)分析按组织_按天统计失败，customerId为：" + customerId + "dateId为：" + dateId, e);
} }
//按天统计：网格内各个分类下的项目总数 //按天统计：网格内各个分类下的项目总数
try { try {
screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId); screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectGridData(customerId, dateId);
} catch (Exception e) { } catch (Exception e) {
log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e); log.error("按天统计：网格内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, e);
} }
// 按天统计：组织内各个分类下的项目总数 // 按天统计：组织内各个分类下的项目总数
try { try {
screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId); screenProjectCategoryGridAndOrgDailyService.extractCategoryProjectOrgData(customerId, dateId);
} catch (Exception e) { } catch (Exception e) {
log.error("按天统计：组织内各个分类下的项目总数，customerId为：" + customerId + "dateId为：" + dateId, 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(() -> { threadPool.submit(() -> {
//治理能力排行screen_govern_rank_data //治理能力排行screen_govern_rank_data
try { try {
governRankDataExtractService.extractGridDataDaily(customerId, dateId); try {
} catch (Exception e) { governRankDataExtractService.extractGridDataDaily(customerId, dateId);
log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e); } catch (Exception e) {
} log.error("治理能力排行【网格】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
try { }
governRankDataExtractService.extractCommunityDataDaily(customerId, dateId); try {
} catch (Exception e) { governRankDataExtractService.extractCommunityDataDaily(customerId, dateId);
log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e); } catch (Exception e) {
} log.error("治理能力排行【社区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
try { }
governRankDataExtractService.extractStreetDataDaily(customerId, dateId); try {
} catch (Exception e) { governRankDataExtractService.extractStreetDataDaily(customerId, dateId);
log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e); } catch (Exception e) {
} log.error("治理能力排行【街道】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
try { }
governRankDataExtractService.extractDistrictDataDaily(customerId, dateId); try {
} catch (Exception e) { governRankDataExtractService.extractDistrictDataDaily(customerId, dateId);
log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e); } catch (Exception e) {
} log.error("治理能力排行【全区】抽取到大屏失败，customerId为：" + customerId + "dateId为：" + dateId, e);
}
try { try {
ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO(); ExtractFactGridGovernDailyFromDTO extractFactGridGovernDailyFromDTO = new ExtractFactGridGovernDailyFromDTO();
extractFactGridGovernDailyFromDTO.setCustomerId(customerId); extractFactGridGovernDailyFromDTO.setCustomerId(customerId);
extractFactGridGovernDailyFromDTO.setDateId(dateId); extractFactGridGovernDailyFromDTO.setDateId(dateId);
factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO); factGridGovernDailyService.extractFactGridGovernDaily(extractFactGridGovernDailyFromDTO);
} catch (Exception e) { } catch (Exception e) {
log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e); log.error("治理指数-网格fact_grid_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
} }
try { try {
factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId); factAgencyGovernDailyService.extractFactAgencyGovernDaily(customerId, dateId);
} catch (Exception e) { } catch (Exception e) {
log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e); log.error("治理指数-组织fact_agency_govern_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e);
} }
try { try {
factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId); factGridMemberStatisticsDailyService.extractGridMemberStatisticsDaily(customerId, dateId);
} catch (Exception e) { } catch (Exception e) {
log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, 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 { try {
latch.await(); latch.await();

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

@ -352,7 +352,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
entity.setProjectId(project.getProjectId()); entity.setProjectId(project.getProjectId());
entity.setOriginCategoryCode(category); entity.setOriginCategoryCode(category);
CustomerProjectCategoryDictEntity categoryEntity = customerProjectCategoryDictService.getByCategoryCode(customerId, category); CustomerProjectCategoryDictEntity categoryEntity = customerProjectCategoryDictService.getByCategoryCode(customerId, category);
if (null != categoryEntity) { if (null == categoryEntity) {
log.error("customerId:{} categoryCode:{} is not exist in ProjectCategoryDict", customerId, category); log.error("customerId:{} categoryCode:{} is not exist in ProjectCategoryDict", customerId, category);
return; return;
} }

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java
View File

@ -60,7 +60,7 @@ public class BaseReportServiceImpl implements BaseReportService {
} }
if (!CollectionUtils.isEmpty(formDTO.getDataList())) { if (!CollectionUtils.isEmpty(formDTO.getDataList())) {
ListUtils.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED) ListUtils.partition(formDTO.getDataList(),NumConstant.ONE_HUNDRED)
.forEach(part->baseReportDao.insertBatchAgencyRegUser(part); .forEach(part->baseReportDao.insertBatchAgencyRegUser(part));
} }
} }

14
epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/ExDeptDTO.java
View File

@ -68,14 +68,24 @@ public class ExDeptDTO implements Serializable {
*/ */
private String gridCode; private String gridCode;
/**
* 组织类型
*/
private String isCgorg;
/** /**
* （区县平台）部门id * （区县平台）部门id
*/ */
private String deptIdQx; private String qxDeptId;
/**
* （区县平台）部门/网格名称
*/
private String qxDeptCode;
/** /**
* （区县平台）部门/网格名称 * （区县平台）部门/网格名称
*/ */
private String deptNameQx; private String qxDeptName;
} }

16
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/ExDeptEntity.java
View File

@ -65,18 +65,28 @@ public class ExDeptEntity {
private String deptCode; private String deptCode;
/** /**
* * （省标准）区划编码/网格编码
*/ */
private String gridCode; private String gridCode;
/**
* 组织类型
*/
private String isCgorg;
/** /**
* （区县平台）部门id * （区县平台）部门id
*/ */
private String deptIdQx; private String qxDeptId;
/**
* （区县平台）部门/网格名称
*/
private String qxDeptCode;
/** /**
* （区县平台）部门/网格名称 * （区县平台）部门/网格名称
*/ */
private String deptNameQx; private String qxDeptName;
} }

8
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java
View File

@ -90,8 +90,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
List<ExDeptEntity> ExList = new ArrayList<>(); List<ExDeptEntity> ExList = new ArrayList<>();
result.getData().forEach(ag->{ result.getData().forEach(ag->{
ExDeptEntity entity = new ExDeptEntity(); ExDeptEntity entity = new ExDeptEntity();
entity.setDeptIdQx(ag.getId()); entity.setQxDeptId(ag.getId());
entity.setDeptNameQx(ag.getOrganizationName()); entity.setQxDeptName(ag.getOrganizationName());
entity.setGridCode(ag.getCode()); entity.setGridCode(ag.getCode());
ExList.add(entity); ExList.add(entity);
}); });
@ -138,8 +138,8 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
List<ExDeptEntity> ExList = new ArrayList<>(); List<ExDeptEntity> ExList = new ArrayList<>();
result.getData().forEach(ag -> { result.getData().forEach(ag -> {
ExDeptEntity entity = new ExDeptEntity(); ExDeptEntity entity = new ExDeptEntity();
entity.setDeptIdQx(ag.getId()); entity.setQxDeptId(ag.getId());
entity.setDeptNameQx(ag.getGridName()); entity.setQxDeptName(ag.getGridName());
entity.setGridCode(ag.getCode()); entity.setGridCode(ag.getCode());
ExList.add(entity); ExList.add(entity);
}); });

2
epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExDeptServiceImpl.java
View File

@ -104,7 +104,7 @@ public class ExDeptServiceImpl extends BaseServiceImpl<ExDeptDao, ExDeptEntity>
@Override @Override
public Map<String, Integer> getDeptMap() { public Map<String, Integer> getDeptMap() {
LambdaQueryWrapper<ExDeptEntity> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<ExDeptEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.ne(ExDeptEntity::getGridCode, null); wrapper.isNotNull(ExDeptEntity::getGridCode);
List<ExDeptEntity> entityList = baseDao.selectList(wrapper); List<ExDeptEntity> entityList = baseDao.selectList(wrapper);
if (CollectionUtils.isEmpty(entityList)) { if (CollectionUtils.isEmpty(entityList)) {
return Collections.emptyMap(); return Collections.emptyMap();

Write Preview
Loading…
Cancel
Save