From 0873aa79cc4221f8614ed4e59962a13802208556 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 24 Jun 2020 13:54:48 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/project/constant/ProjectConstant.java | 2 +- .../controller/project/ProjectController.java | 2 +- .../service/project/impl/ProjectServiceImpl.java | 2 +- .../service/impl/StatsProjectServiceImpl.java | 15 +++++++++++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java index d3c8d8bf1c..a23dfa1a62 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/constant/ProjectConstant.java @@ -6,7 +6,7 @@ package com.epmet.project.constant; **/ public interface ProjectConstant { - String DATE = "date"; + String DAY = "day"; String MONTH = "month"; /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java index 5a96496ef6..47a4765288 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/project/ProjectController.java @@ -72,7 +72,7 @@ public class ProjectController { @PostMapping("incrtrend") public Result> incrTrend(@LoginUser TokenDto tokenDto, @RequestBody ProjectIncrTrendFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, ProjectIncrTrendFormDTO.ProjectIncr.class); - if (!ProjectConstant.DATE.equals(formDTO.getType()) && !ProjectConstant.MONTH.equals(formDTO.getType())) { + if (!ProjectConstant.DAY.equals(formDTO.getType()) && !ProjectConstant.MONTH.equals(formDTO.getType())) { throw new RenException(ProjectConstant.TYPE_EXCEPTION); } return new Result>().ok(projectService.getProjectIncrTrend(tokenDto, formDTO)); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index 1d8871803d..846aac9398 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java @@ -133,7 +133,7 @@ public class ProjectServiceImpl implements ProjectService { String agencyId = getLoginUserDetails(tokenDto); //2:查询机关过去九十天日统计数据(sql降序取前九十条) - if (ProjectConstant.DATE.equals(formDTO.getType())) { + if (ProjectConstant.DAY.equals(formDTO.getType())) { resultList = projectDao.selectIncrTrendDaily(agencyId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 1e5cac4aac..7935f44b5e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -71,10 +71,11 @@ public class StatsProjectServiceImpl implements StatsProjectService { if (!CollectionUtils.isEmpty(customerIdList)) { for (String customerId : customerIdList) { try { + log.debug("for循环统计机关-项目-日月数据，当前统计的客户Id:" + customerId); //遍历统计每一个客户数据 customerAgencyStats(customerId); } catch (Exception e) { - log.error("项目-机关-数据统计程序错误，对应客户Id:"+customerId, e); + log.error("项目-机关-数据统计程序错误，对应客户Id:" + customerId, e); log.error("Error creating model JSON", e); } } @@ -92,11 +93,13 @@ public class StatsProjectServiceImpl implements StatsProjectService { DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); //2:根据客户Id查询机关维度表数据 + log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询机关维度数据，当前客户Id:" + customerId); DimAgencyDTO dimAgencyDTO = new DimAgencyDTO(); dimAgencyDTO.setCustomerId(customerId); List dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO); //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据) + log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目业务表结案数据，当前客户Id:"+customerId); ProjectEntity projectEntity = new ProjectEntity(); projectEntity.setCustomerId(customerId); projectEntity.setCreatedTime(date); @@ -104,16 +107,19 @@ public class StatsProjectServiceImpl implements StatsProjectService { List projectList = projectService.getProjectList(projectEntity); //4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据) + log.debug("StatsProjectServiceImpl.customerAgencyStats-根据客户Id查询项目进展表业务数据，当前客户Id:"+customerId); List processList = projectProcessService.getProcessList(projectEntity); //5:机关层级日月统计 if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) { //5.1:执行机关日数据统计 + log.debug("StatsProjectServiceImpl.customerAgencyStats-开始执行机关日统计方法，方法名:agencyDateProjectStats,客户Id:"+customerId); agencyDateProjectStats(customerId, dimId, dimAgencyList, projectList, processList); //5.2:执行机关月数据统计 //if (Calendar.getInstance().get(Calendar.DATE) == 1) { - agencyMonthProjectStats(customerId, dimId, dimAgencyList); + log.debug("StatsProjectServiceImpl.customerAgencyStats-开始执行机关月统计方法，方法名:agencyMonthProjectStats,客户Id:"+customerId); + agencyMonthProjectStats(customerId, dimId, dimAgencyList); //} } @@ -350,7 +356,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { //遍历统计每一个客户数据 customerGridStats(customerId); } catch (Exception e) { - log.error("项目-网格-数据统计程序错误，对应客户Id:"+customerId, e); + log.error("项目-网格-数据统计程序错误，对应客户Id:" + customerId, e); log.error("Error creating model JSON", e); } } @@ -387,11 +393,12 @@ public class StatsProjectServiceImpl implements StatsProjectService { //5.2:执行网格月数据统计 //if (Calendar.getInstance().get(Calendar.DATE) == 1) { - gridMonthProjectStats(customerId, dimId, dimGridList); + gridMonthProjectStats(customerId, dimId, dimGridList); //} } } + /** * @param customerId * @return From 885d9713fa4e1e1f79707e53200193cfde06a762 Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 24 Jun 2020 14:07:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E5=8F=82?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/StatsTopicServiceImpl.java | 1 + .../java/com/epmet/service/impl/StatsUserServiceImpl.java | 5 +++-- .../java/com/epmet/service/topic/impl/TopicServiceImpl.java | 1 + .../java/com/epmet/service/user/impl/UserServiceImpl.java | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java index 958de6ee31..e2f275f83c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java @@ -64,6 +64,7 @@ public class StatsTopicServiceImpl implements StatsTopicService { //1.初始化时间参数 Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); + calendar.add(Calendar.DATE, NumConstant.ONE_NEG); calendar.set(Calendar.HOUR_OF_DAY, 0); calendar.set(Calendar.MINUTE, 0); calendar.set(Calendar.SECOND, 0); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java index 721165693b..d0c6d3a40c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java @@ -61,7 +61,8 @@ public class StatsUserServiceImpl implements StatsUserService { //1.初始化时间参数 Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); - //获取今日的零点 + //获取当日的零点 + calendar.add(Calendar.DATE, NumConstant.ONE_NEG); calendar.set(Calendar.HOUR_OF_DAY, 0); calendar.set(Calendar.MINUTE, 0); calendar.set(Calendar.SECOND, 0); @@ -71,7 +72,7 @@ public class StatsUserServiceImpl implements StatsUserService { //3.初始化机关维度 List agencies = dimAgencyService.getAllAgency(customerId); - List topAgencies = dimAgencyService.getTopAgency(customerId); + //List topAgencies = dimAgencyService.getTopAgency(customerId); //4.计算机关统计数据、生成唯一性统计数据 UserStatisticalData agencyData = userService.traverseAgencyUser(agencies,date,timeDimension); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java index 5d20be9489..61eeb5f503 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java @@ -169,6 +169,7 @@ public class TopicServiceImpl implements TopicService { Boolean isMonthEnd = false; Calendar calendar = Calendar.getInstance(); calendar.setTime(new Date()); + //前一天 calendar.add(Calendar.DATE, NumConstant.ONE_NEG); Date targetDateCheck = null == targetDate ? calendar.getTime() : targetDate; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java index 6e50eebd95..26fe63a713 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java @@ -284,8 +284,8 @@ public class UserServiceImpl implements UserService { partiAgencyD.setWarmIncr(warmPartiData.getIncr()); partiAgencyD.setPartymemberIncr(partyPartiData.getIncr()); partiAgencyD.setResiProportion(new BigDecimal(NumConstant.ONE)); - partiAgencyD.setPartymemberProportion(null == partiData.getTotal() || partiData.getTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)partyPartiData.getTotal()/(float)partiData.getIncr() ))); - partiAgencyD.setWarmHeartedProportion(null == partiData.getTotal() || partiData.getTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)warmPartiData.getTotal()/(float)partiData.getIncr() ))); + partiAgencyD.setPartymemberProportion(null == partiData.getTotal() || partiData.getTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)partyPartiData.getTotal()/(float)partiData.getTotal() ))); + partiAgencyD.setWarmHeartedProportion(null == partiData.getTotal() || partiData.getTotal() == NumConstant.ZERO ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float)warmPartiData.getTotal()/(float)partiData.getTotal() ))); partiAgencyD.setCreatedBy(ModuleConstant.CREATED_BY_STATISTICAL_ROBOT); if(null != dataPacket.getPartiAgencyDailyList()){ From 5b637ec522212f90b9355fe4c513ebd1518c7c28 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Wed, 24 Jun 2020 14:18:24 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/group/constant/GroupConstant.java | 2 +- .../epmet/topic/constant/TopicConstant.java | 2 +- .../main/resources/mapper/topic/TopicDao.xml | 24 ++++++------------- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java index 699090f931..cfc64da174 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java @@ -7,6 +7,6 @@ package com.epmet.group.constant; public interface GroupConstant { String MONTH = "month"; - String DATE = "date"; + String DATE = "day"; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java index 62c27f4b55..46259526ce 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java @@ -26,5 +26,5 @@ public interface TopicConstant { String SHIFTED = "已转议题"; String MONTH = "month"; - String DATE = "date"; + String DATE = "day"; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml index 06e60565b6..6945fb4baa 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/topic/TopicDao.xml @@ -13,10 +13,9 @@ WHERE del_flag = '0' AND agency_id = #{agencyId} - GROUP BY - topic_status_id ORDER BY date_id DESC + LIMIT 3 @@ -42,16 +41,15 @@ WHEN topic_status_id = 'hidden' THEN '已屏蔽' WHEN topic_status_id = 'closed' THEN '已关闭' ELSE '无' END) AS name, - CONCAT(topic_proportion,'%') AS ratio + CONCAT(topic_proportion * 100,'%') AS ratio FROM fact_topic_status_agency_daily WHERE del_flag = '0' AND agency_id = #{agencyId} - GROUP BY - topic_status_id ORDER BY date_id DESC + LIMIT 3 @@ -80,10 +78,7 @@ LEFT JOIN dim_agency da ON da.id = ftsad.agency_id AND da.del_flag = '0' WHERE ftsad.del_flag = '0' - GROUP BY - ftsad.topic_status_id - ORDER BY - ftsad.date_id DESC + AND ftsad.date_id = (SELECT MAX(date_id) AS dateId FROM fact_topic_status_agency_daily WHERE del_flag = '0') @@ -98,8 +93,7 @@ LEFT JOIN dim_agency da ON da.id = ftiad.agency_id AND da.del_flag = '0' WHERE ftiad.del_flag = '0' - GROUP BY ftiad.agency_id - ORDER BY ftiad.date_id DESC + AND ftiad.date_id = (SELECT MAX(date_id) AS dateId FROM fact_topic_issue_agency_daily WHERE del_flag = '0') @@ -128,10 +122,7 @@ LEFT JOIN dim_grid dg ON dg.id = ftsad.grid_id AND dg.del_flag = '0' WHERE ftsad.del_flag = '0' - GROUP BY - ftsad.topic_status_id - ORDER BY - ftsad.date_id DESC + AND ftsad.date_id = (SELECT MAX(date_id) AS dateId FROM fact_topic_status_grid_daily WHERE del_flag = '0') @@ -146,8 +137,7 @@ LEFT JOIN dim_grid da ON da.id = ftiad.grid_id AND da.del_flag = '0' WHERE ftiad.del_flag = '0' - GROUP BY ftiad.grid_id - ORDER BY ftiad.date_id DESC + AND ftiad.date_id = (SELECT MAX(date_id) AS dateId FROM fact_topic_issue_grid_daily WHERE del_flag = '0') From 5056331d76551609c47cd8981182b2b43bce5d17 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 24 Jun 2020 14:43:06 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E7=BB=B4=E5=BA=A6=E6=97=B6=E5=80=99=EF=BC=8Clast=5Fex?= =?UTF-8?q?ec=5Ftime=E7=9A=84exec=5Ftime=E4=B8=BAnow=E7=9A=84bug=EF=BC=8C?= =?UTF-8?q?=E5=88=9D=E6=AC=A1=E5=88=9B=E5=BB=BA=E6=97=B6=E5=80=99=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E4=B8=BAnull=EF=BC=8Cinit=E4=B9=8B=E5=90=8E=E6=94=B9?= =?UTF-8?q?=E4=B8=BAnow=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/stats/impl/LastExecRecordServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java index 5fe4e6f924..ba6e33d157 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/LastExecRecordServiceImpl.java @@ -25,9 +25,7 @@ public class LastExecRecordServiceImpl implements LastExecRecordService { */ @Override public LastExecRecordEntity createLastExecRecord(String statsSubject) { - Date now = new Date(); LastExecRecordEntity entity = new LastExecRecordEntity(); - entity.setExecTime(now); entity.setSubject(statsSubject); entity.setCreatedBy(RobotConstant.DIMENSION_ROBOT); entity.setUpdatedBy(RobotConstant.DIMENSION_ROBOT); From 63eeb606a46ba618392468cbba84674fd7224dad Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Wed, 24 Jun 2020 14:57:19 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=AF=9D=E9=A2=98=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/topic/impl/TopicServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java index 128cdf183c..0859bd2632 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java @@ -160,7 +160,7 @@ public class TopicServiceImpl implements TopicService { TopicShiftedCountResultDTO shiftedCount = topicDao.getShiftedCount(agencyId); Integer collect = topicSummaryInfo.stream().collect(Collectors.summingInt(TopicSummaryInfoResultDTO::getValue)); String ratio; - ratio = collect == NumConstant.ZERO ? NumConstant.ZERO + TopicConstant.RATIO : (shiftedCount.getShiftedIssueCount() / collect) * NumConstant.ONE_HUNDRED + TopicConstant.RATIO; + ratio = collect == NumConstant.ZERO ? NumConstant.ZERO + TopicConstant.RATIO : ((float)shiftedCount.getShiftedIssueCount() / (float)collect) * NumConstant.ONE_HUNDRED + TopicConstant.RATIO; TopicSummaryInfoResultDTO result = new TopicSummaryInfoResultDTO(); result.setName(TopicConstant.SHIFTED); result.setRatio(ratio); From 7dc9c33a30e03bb266d5f151d414b590d71c733a Mon Sep 17 00:00:00 2001 From: wangchao Date: Wed, 24 Jun 2020 14:57:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=BB=84=E4=BA=8B=E5=AE=9E=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E8=AF=9D=E9=A2=98=E4=BA=8B=E5=AE=9E=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E8=AF=9D=E9=A2=98=E7=8A=B6=E6=80=81=E7=BB=B4=E5=BA=A6=E8=A1=A8?= =?UTF-8?q?sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/data_statistical.sql | 399 ++++++++++++++++++ 1 file changed, 399 insertions(+) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/data_statistical.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/data_statistical.sql index 81f9cb98f1..25b7b1e955 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/data_statistical.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/data_statistical.sql @@ -572,5 +572,404 @@ CREATE TABLE `fact_tag_viewed_grid_yearly` ( PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '文章引用标签阅读数量【网格】年度统计表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for fact_group_agency_monthly +-- ---------------------------- +DROP TABLE IF EXISTS fact_group_agency_monthly;;/*SkipError*/ +CREATE TABLE `fact_group_agency_monthly` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关ID', + `PID` varchar(64) DEFAULT NULL COMMENT '父级机关ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '统计月份ID 关联月份dim表', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '统计季度ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '统计年份ID', + `GRID_TOTAL` int(11) DEFAULT NULL COMMENT '网格数 截至到月末的机关下网格数', + `GROUP_TOTAL` int(11) DEFAULT NULL COMMENT '小组数 截止到月末的新增数（该月内所有的新增数字之和）', + `GROUP_MEMBER_TOTAL` int(11) DEFAULT NULL COMMENT '机关下网格组内总人数 不去重', + `GROUP_MEMBER_AVG_COUNT` int(11) DEFAULT NULL COMMENT '小组平均人数 月末一天的平均数', + `GROUP_MEDIAN` int(11) DEFAULT NULL COMMENT '小组中位数 月末一天的中位数（人）', + `GROUP_INCR` int(11) DEFAULT NULL COMMENT '小组增量', + `GROUP_MEMBER_MAX_COUNT` int(11) DEFAULT NULL COMMENT '小组成员最大数', + `MAX_MEMBER_GROUP_ID` varchar(32) DEFAULT NULL COMMENT '成员最多小组ID', + `GROUP_MEMBER_MIN_COUNT` int(11) DEFAULT NULL COMMENT '小组成员最小数', + `MIN_MEMBER_GROUP_ID` varchar(32) DEFAULT NULL COMMENT '成员最少小组ID', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 未删除：0,已删除：1', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='组-机关月统计数据'; + + + + + +-- ---------------------------- +-- Table structure for fact_group_grid_daily +-- ---------------------------- +DROP TABLE IF EXISTS fact_group_grid_daily;;/*SkipError*/ +CREATE TABLE `fact_group_grid_daily` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机构ID 关联机关dim表', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID', + `DATE_ID` varchar(32) NOT NULL COMMENT '统计日期 关联日期dim表', + `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '月份ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID', + `GRID_TOTAL` int(11) DEFAULT '0' COMMENT '网格数 当前网格下的网格数', + `GROUP_TOTAL` int(11) DEFAULT '0' COMMENT '小组数', + `GROUP_MEMBER_TOTAL` int(11) DEFAULT '0' COMMENT '网格下所有组内总人数 不去重', + `GROUP_MEMBER_AVG_COUNT` int(11) DEFAULT '0' COMMENT '小组平均人数', + `GROUP_MEDIAN` int(11) DEFAULT '0' COMMENT '小组中位数 截至统计日期，小组人数依次由小到大排开取中位数', + `GROUP_INCR` int(11) DEFAULT '0' COMMENT '小组增量', + `GROUP_MEMBER_MAX_COUNT` int(11) DEFAULT NULL COMMENT '小组成员最大数', + `MAX_MEMBER_GROUP_ID` varchar(32) DEFAULT NULL COMMENT '最多成员小组ID', + `GROUP_MEMBER_MIN_COUNT` int(11) DEFAULT NULL COMMENT '小组成员最小数', + `MIN_MEMBER_GROUP_ID` varchar(32) DEFAULT NULL COMMENT '最少成员小组ID', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 未删除：0,已删除：1', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='组-网格日统计数据'; + + + + +-- ---------------------------- +-- Table structure for fact_group_agency_daily +-- ---------------------------- +DROP TABLE IF EXISTS fact_group_agency_daily;;/*SkipError*/ +CREATE TABLE `fact_group_agency_daily` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(32) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机构ID', + `PID` varchar(64) DEFAULT NULL COMMENT '父级机关ID', + `DATE_ID` varchar(32) NOT NULL COMMENT '统计日期 关联日期dim表', + `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID', + `GRID_TOTAL` int(11) DEFAULT '0' COMMENT '网格总数 截至统计日期', + `GROUP_TOTAL_COUNT` int(11) DEFAULT '0' COMMENT '网格小组数（包含所有下级机关的网格小组） 截至统计日期', + `GROUP_MEMBER_TOTAL_COUNT` int(11) DEFAULT '0' COMMENT '机关下网格小组人数总计 不去重', + `GROUP_MEMBER_AVG_COUNT` int(11) DEFAULT '0' COMMENT '小组平均人数 截至统计日期', + `GROUP_MEDIAN` int(11) DEFAULT '0' COMMENT '小组中位数 截至统计日期，小组人数依次由小到大排开取中位数', + `GROUP_INCR` int(11) DEFAULT '0' COMMENT '当天小组增量', + `GROUP_MEMBER_MAX_COUNT` varchar(32) DEFAULT NULL COMMENT '小组最大成员数', + `MAX_MEMBER_GROUP_ID` varchar(32) DEFAULT NULL COMMENT '最多成员小组ID', + `GROUP_MEMBER_MIN_COUNT` varchar(32) DEFAULT NULL COMMENT '小组最小成员数', + `MIN_MEMBER_GROUP_ID` varchar(32) DEFAULT NULL COMMENT '最少成员小组ID', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 未删除：0,已删除：1', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='组-机关日统计数据'; + + + + + +-- ---------------------------- +-- Table structure for fact_topic_status_agency_daily +-- ---------------------------- +DROP TABLE IF EXISTS fact_topic_status_agency_daily;;/*SkipError*/ +CREATE TABLE `fact_topic_status_agency_daily` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机构ID 关联机关dm表', + `PID` varchar(64) NOT NULL COMMENT '父级机关ID', + `DATE_ID` varchar(32) NOT NULL COMMENT '统计日期 关联日期dm表', + `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID', + `TOPIC_STATUS_ID` varchar(32) NOT NULL COMMENT '话题状态ID 关联dim_topic_status表\n讨论中 discussing\n已屏蔽 hidden\n已关闭 closed\n已转项目 shift_project', + `TOPIC_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '话题数量 指定状态的话题数量', + `TOPIC_PROPORTION` decimal(4,2) NOT NULL COMMENT '话题状态百分比 指定状态话题数/话题总数\n总数在topic_total_agency_daily中', + `TOPIC_INCREMENT` int(11) NOT NULL DEFAULT '0' COMMENT '话题增量 单位时间内的状态话题的增加数', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='状态话题-机关日统计数据表'; + + + + + + +-- ---------------------------- +-- Table structure for fact_topic_status_agency_monthly +-- ---------------------------- +DROP TABLE IF EXISTS fact_topic_status_agency_monthly;;/*SkipError*/ +CREATE TABLE `fact_topic_status_agency_monthly` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机构ID 关联机关dm表', + `PID` varchar(64) DEFAULT NULL COMMENT '父级机关ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '统计月份 关联月度dm表', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID 关联季度dm表', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID 关联年度dm表', + `TOPIC_STATUS_ID` varchar(32) NOT NULL COMMENT '话题状态 讨论中 discussing\n已屏蔽 hidden\n已关闭 closed\n已转项目 shift_project', + `TOPIC_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '话题数量', + `TOPIC_PROPORTION` decimal(4,2) NOT NULL COMMENT '话题状态占比 月末一天 \n指定状态话题数/话题总数\n总数在topic_total_agency_daily中', + `TOPIC_INCR` int(11) NOT NULL DEFAULT '0' COMMENT '话题增量 单位时间内的话题状态增加数', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='状态话题-机关月统计数据表'; + + + + + +-- ---------------------------- +-- Table structure for fact_topic_status_grid_daily +-- ---------------------------- +DROP TABLE IF EXISTS fact_topic_status_grid_daily;;/*SkipError*/ +CREATE TABLE `fact_topic_status_grid_daily` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关ID', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID 关联网格dm表', + `DATE_ID` varchar(32) NOT NULL COMMENT '日期ID', + `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID', + `TOPIC_STATUS_ID` varchar(32) DEFAULT NULL COMMENT '话题状态ID 讨论中 discussing\n已屏蔽 hidden\n已关闭 closed\n已转项目 shift_project', + `TOPIC_COUNT` int(11) DEFAULT '0' COMMENT '话题数量', + `TOPIC_PROPORTION` decimal(4,2) DEFAULT NULL COMMENT '话题状态占比 指定状态话题数/话题总数\n总数在topic_total_grid_daily中', + `TOPIC_INCREMENT` int(11) DEFAULT '0' COMMENT '话题增量', + `DEL_FLAG` varchar(32) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='状态话题-网格日统计数据表'; + + + + + + +-- ---------------------------- +-- Table structure for fact_topic_total_agency_daily +-- ---------------------------- +DROP TABLE IF EXISTS fact_topic_total_agency_daily;;/*SkipError*/ +CREATE TABLE `fact_topic_total_agency_daily` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关ID', + `PID` varchar(64) DEFAULT NULL COMMENT '父级机关ID', + `DATE_ID` varchar(32) NOT NULL COMMENT '统计日期 关联日期dm表', + `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID', + `TOPIC_TOTAL` int(11) DEFAULT '0' COMMENT '话题总数', + `TOPIC_INCR` int(11) DEFAULT '0' COMMENT '话题增量', + `HIDDEN_TOTAL_COUNT` int(11) DEFAULT '0' COMMENT '屏蔽话题数', + `ISSUE_TOTAL_COUNT` int(11) DEFAULT '0' COMMENT '已转议题数', + `DEL_FLAG` varchar(32) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='话题总数-机关日统计表'; + + + + + + +-- ---------------------------- +-- Table structure for fact_topic_total_grid_daily +-- ---------------------------- +DROP TABLE IF EXISTS fact_topic_total_grid_daily;;/*SkipError*/ +CREATE TABLE `fact_topic_total_grid_daily` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) DEFAULT NULL COMMENT '机关ID', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID', + `DATE_ID` varchar(32) NOT NULL COMMENT '统计日期 关联日期dm表', + `WEEK_ID` varchar(32) DEFAULT NULL COMMENT '周ID', + `MONTH_ID` varchar(32) DEFAULT NULL COMMENT '月ID', + `QUARTER_ID` varchar(32) DEFAULT NULL COMMENT '季度ID', + `YEAR_ID` varchar(32) DEFAULT NULL COMMENT '年ID', + `TOPIC_TOTAL` int(11) DEFAULT NULL COMMENT '话题总量', + `TOPIC_INCR` int(11) DEFAULT NULL COMMENT '话题增量', + `HIDDEN_TOTAL_COUNT` int(11) DEFAULT NULL COMMENT '屏蔽话题数量', + `ISSUE_TOTAL_COUNT` int(11) DEFAULT NULL COMMENT '已转议题数量', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL DEFAULT '0' COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL DEFAULT '0' COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='话题总数-网格日统计表'; + + + + + + +-- ---------------------------- +-- Table structure for fact_topic_issue_agency_daily +-- ---------------------------- +DROP TABLE IF EXISTS fact_topic_issue_agency_daily;;/*SkipError*/ +CREATE TABLE `fact_topic_issue_agency_daily` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL DEFAULT '' COMMENT '客户Id', + `PID` varchar(64) DEFAULT NULL COMMENT '父级机关ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关ID', + `DATE_ID` varchar(32) NOT NULL COMMENT '日期ID', + `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID', + `ISSUE_TOTAL` int(11) DEFAULT '0' COMMENT '已转议题数量', + `ISSUE_INCR` int(11) DEFAULT '0' COMMENT '已转议题当日增量', + `DEL_FLAG` varchar(32) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='转议题话题-机关日统计数据表'; + + + + + +-- ---------------------------- +-- Table structure for fact_topic_issue_agency_monthly +-- ---------------------------- +DROP TABLE IF EXISTS fact_topic_issue_agency_monthly;;/*SkipError*/ +CREATE TABLE `fact_topic_issue_agency_monthly` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关ID', + `PID` varchar(64) DEFAULT NULL COMMENT '父级ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID', + `ISSUE_TOTAL` int(11) DEFAULT '0' COMMENT '已转议题总量', + `ISSUE_INCR` int(11) DEFAULT '0' COMMENT '已转议题增量', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='转议题话题-机关月统计表'; + + + + + + +-- ---------------------------- +-- Table structure for fact_topic_issue_grid_daily +-- ---------------------------- +DROP TABLE IF EXISTS fact_topic_issue_grid_daily;;/*SkipError*/ +CREATE TABLE `fact_topic_issue_grid_daily` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关ID', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID', + `DATE_ID` varchar(32) NOT NULL COMMENT '日期ID', + `WEEK_ID` varchar(32) NOT NULL COMMENT '周ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID', + `ISSUE_INCR` int(11) DEFAULT '0' COMMENT '新增转议题数', + `ISSUE_TOTAL` int(11) DEFAULT '0' COMMENT '转议题总数', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`,`CUSTOMER_ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='转议题话题-网格日统计表'; + + + + + + +-- ---------------------------- +-- Table structure for fact_topic_issue_grid_monthly +-- ---------------------------- +DROP TABLE IF EXISTS fact_topic_issue_grid_monthly;;/*SkipError*/ +CREATE TABLE `fact_topic_issue_grid_monthly` ( + `ID` varchar(64) NOT NULL COMMENT '唯一标识', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '机关ID', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID', + `MONTH_ID` varchar(32) NOT NULL COMMENT '月ID', + `QUARTER_ID` varchar(32) NOT NULL COMMENT '季度ID', + `YEAR_ID` varchar(32) NOT NULL COMMENT '年ID', + `ISSUE_INCR` int(11) NOT NULL DEFAULT '0' COMMENT '已转议题增量', + `ISSUE_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '已转议题总量', + `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='转议题话题-网格月统计表'; + + + + +-- ---------------------------- +-- Table structure for dim_topic_status +-- ---------------------------- +DROP TABLE IF EXISTS dim_topic_status;;/*SkipError*/ +CREATE TABLE dim_topic_status( + ID VARCHAR(32) NOT NULL COMMENT '唯一标识 话题状态ID"discussing"、"hidden"、"closed"' , + STATUS_DESC VARCHAR(32) NOT NULL COMMENT '状态描述 讨论中 已屏蔽 已关闭' , + DEL_FLAG VARCHAR(32) NOT NULL DEFAULT 0 COMMENT '删除标识' , + REVISION INT NOT NULL DEFAULT 0 COMMENT '乐观锁' , + CREATED_BY VARCHAR(32) NOT NULL COMMENT '创建人' , + CREATED_TIME DATETIME NOT NULL COMMENT '创建时间' , + UPDATED_BY VARCHAR(32) NOT NULL COMMENT '更新人' , + UPDATED_TIME DATETIME NOT NULL COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '话题状态维度表 ';; + +ALTER TABLE dim_topic_status COMMENT '话题状态维度表';; + + + SET FOREIGN_KEY_CHECKS = 1;