diff --git a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml index e9d8d41470..0fb85349bf 100644 --- a/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.15 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-admin-server:0.3.28 ports: - "8082:8082" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index 3661fc8c37..8c073dd8c3 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.17 + 0.3.28 com.epmet epmet-admin @@ -246,7 +246,7 @@ - false + true true diff --git a/epmet-auth/deploy/docker-compose-prod.yml b/epmet-auth/deploy/docker-compose-prod.yml index 1556650965..d327a24e3e 100644 --- a/epmet-auth/deploy/docker-compose-prod.yml +++ b/epmet-auth/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.70 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-auth:0.3.96 ports: - "8081:8081" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 5f67b41712..dbc60cf787 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.72 + 0.3.96 com.epmet epmet-cloud @@ -352,7 +352,7 @@ - false + true wxcb6ce2ed0c5ae54c diff --git a/epmet-gateway/deploy/docker-compose-prod.yml b/epmet-gateway/deploy/docker-compose-prod.yml index ebcdc7eafc..789eaec898 100644 --- a/epmet-gateway/deploy/docker-compose-prod.yml +++ b/epmet-gateway/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.43 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-gateway:0.3.69 ports: - "8080:8080" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index d180c7cab9..2ef1bea3dd 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.43 + 0.3.69 com.epmet epmet-cloud @@ -347,8 +347,8 @@ lb://epmet-openapi-scan - lb://epmet-third-server - + + http://localhost:8110 lb://epmet-heart-server @@ -508,7 +508,7 @@ - false + true diff --git a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml index 2906b958ce..915df72317 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-aggregator-server: container_name: data-aggregator-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-aggregator-server:0.3.78 ports: - "8114:8114" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 64f67470f9..06f591c6c0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -2,6 +2,7 @@ + 0.3.78 data-aggregator com.epmet @@ -571,7 +572,7 @@ - false + true true diff --git a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml index c07cfe618a..0f4b2974ec 100644 --- a/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-report-server: container_name: data-report-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.59 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-report-server:0.3.195 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-report/data-report-server/pom.xml b/epmet-module/data-report/data-report-server/pom.xml index 25a8220b54..84e5f4d96f 100644 --- a/epmet-module/data-report/data-report-server/pom.xml +++ b/epmet-module/data-report/data-report-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.59 + 0.3.195 data-report-server @@ -346,7 +346,7 @@ - false + true true diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java index 73b56ef7a0..047a16e87b 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -335,7 +335,7 @@ public interface DataStatisticalOpenFeignClient { /** * 事件上报 * @Param formDTO - * @Return {@link Result>} + * @Return {@link Result>} * @Author zhaoqifeng * @Date 2021/10/15 16:50 */ diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml index 6e0f1082aa..3cd9ff7c01 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.81 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/data-statistical-server:0.3.300 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 0fc10e94cb..ded855e3fe 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.81 + 0.3.300 data-statistical com.epmet @@ -636,7 +636,7 @@ false - false + true false diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java index 49d462eaa0..b42b862736 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginExtractController.java @@ -95,12 +95,16 @@ public class FactOriginExtractController { @PostMapping("project") public Result projectData(@RequestBody ExtractOriginFormDTO extractOriginFormDTO) { - List customerIds = dimCustomerService.selectCustomerIdPage(1, 100); - customerIds.forEach(customerId -> { - ExtractOriginFormDTO dto = new ExtractOriginFormDTO(); - dto.setCustomerId(customerId); - projectExtractService.saveOriginProjectDaily(dto); - }); + if (null != extractOriginFormDTO) { + projectExtractService.saveOriginProjectDaily(extractOriginFormDTO); + } else { + List customerIds = dimCustomerService.selectCustomerIdPage(1, 100); + customerIds.forEach(customerId -> { + ExtractOriginFormDTO dto = new ExtractOriginFormDTO(); + dto.setCustomerId(customerId); + projectExtractService.saveOriginProjectDaily(dto); + }); + } return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java index f4f616a722..2209f0e396 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java @@ -224,7 +224,7 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { })); //插入数据 if (!list.isEmpty()) { - factOriginProjectMainDailyService.insertBatch(list); + factOriginProjectMainDailyService.saveOrUpdateBatch(list); } } @@ -319,21 +319,14 @@ public class ProjectExtractServiceImpl implements ProjectExtractService { entity.setOrgType(OrgTypeConstant.AGENCY); entity.setOrgId(process.getAgencyId()); if (!process.getPids().contains(StrConstant.COLON)) { - entity.setPids(""); entity.setPid(NumConstant.ZERO_STR); } else { String[] orgArray = process.getPids().split(StrConstant.COLON); if (orgArray.length > NumConstant.ONE) { entity.setPid(orgArray[orgArray.length - NumConstant.TWO]); - String path = process.getPids().replaceAll(process.getAgencyId(), ""); - if (path.endsWith(StrConstant.COLON)) { - path = path.substring(NumConstant.ZERO, path.length() - NumConstant.ONE); - } - entity.setPids(path); } else { log.warn("【data-statistical】业务数据抽取模块，ProjectExtractServiceImpl.saveOriginProjectDaily:查询出的项目节点发起人所属的orgIdPath不正确，agencyId->{},orgIdPath->{}", process.getAgencyId(), process.getPids()); entity.setPid(NumConstant.ZERO_STR); - entity.setPids(""); } } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java index ed5860169e..33fffebc37 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java @@ -18,7 +18,6 @@ package com.epmet.service.evaluationindex.screen.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java index e3057c2a8e..21a7c06860 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java @@ -220,8 +220,14 @@ public class DataReportingServiceImpl implements DataReportingService { //如果是对应一级分类，则二级分类为空。如果对应平阴二级分类，则取对应的一级分类 CustomerProjectCategoryDictEntity epmetCode = epmetCodeMap.get(code); if (NumConstant.ONE == epmetCode.getLevel()) { - categoryCode = null; parentCode = code; + //如果项目为一级分类 则二级分类默认给第一个 + epmetCode = epmetCodeMap.get(code.concat("01")); + if (epmetCode == null){ + log.warn(" 分类下没有子分类，无法拼接2级分类 code:{}",code); + } else { + categoryCode = epmetCode.getCategoryCode(); + } } else { categoryCode = code; parentCode = epmetCode.getParentCategoryCode(); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql index b5e87ed6f5..9414daa14d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__cpc_subscore_add_samplecount.sql @@ -1,5 +1,5 @@ -alter table fact_index_grid_sub_score add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; -alter table fact_index_community_sub_score - add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; -alter table fact_index_agency_sub_score - add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; \ No newline at end of file +# alter table fact_index_grid_sub_score add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; +# alter table fact_index_community_sub_score +# add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; +# alter table fact_index_agency_sub_score +# add column SAMPLE_COUNT int(10) comment '参与统计的样本个数' after ORIGIN_VALUE; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql index a450ab5eec..60b70ed908 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.14__groupact_analysis.sql @@ -1,47 +1,47 @@ --- epmet_data_statistical 库执行以下脚本 -CREATE TABLE `fact_group_act_daily` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至日期Id：yyyyMMdd', - `ORG_ID` varchar(64) NOT NULL COMMENT '网格id', - `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency', - `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织', - `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.', - `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码', - `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码', - `LEVEL` int(11) NOT NULL COMMENT '分类等级', - `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 组织次数;包含dateId这一天的数据', - `PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 参加人数;包含dateId这一天的数据', - `AVG_PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 平均参加人数;包含dateId这一天的数据', - `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', - `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', - `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织活动(参加人数、组织次数、平均参加人数)按天累计值分析'; - - -CREATE TABLE `fact_group_act_monthly` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `MONTH_ID` varchar(8) NOT NULL COMMENT '数据维度：yyyyMM', - `ORG_ID` varchar(64) NOT NULL COMMENT '网格id', - `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency', - `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织', - `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.', - `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码', - `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码', - `LEVEL` int(11) NOT NULL COMMENT '分类等级', - `ORGANIZE_INCR` int(11) NOT NULL COMMENT '本月内：活动组织次数', - `PARTICIPATE_USER__INCR` int(11) NOT NULL COMMENT '本月内：活动签到人数参加人数', - `AVG_PARTICIPATE_USER_INCR` int(11) NOT NULL COMMENT '本月内：平均参加人数', - `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', - `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', - `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='专项组活动(参加人数、组织次数、平均参加人数)按月增量分析'; \ No newline at end of file +# -- epmet_data_statistical 库执行以下脚本 +# CREATE TABLE `fact_group_act_daily` ( +# `ID` varchar(64) NOT NULL COMMENT '主键', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', +# `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至日期Id：yyyyMMdd', +# `ORG_ID` varchar(64) NOT NULL COMMENT '网格id', +# `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency', +# `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织', +# `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.', +# `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码', +# `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码', +# `LEVEL` int(11) NOT NULL COMMENT '分类等级', +# `ORGANIZE_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 组织次数;包含dateId这一天的数据', +# `PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 参加人数;包含dateId这一天的数据', +# `AVG_PARTICIPATE_USER_TOTAL` int(11) NOT NULL COMMENT '截止到dateId: 平均参加人数;包含dateId这一天的数据', +# `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', +# `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', +# `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', +# `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', +# `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', +# `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', +# PRIMARY KEY (`ID`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织活动(参加人数、组织次数、平均参加人数)按天累计值分析'; +# +# +# CREATE TABLE `fact_group_act_monthly` ( +# `ID` varchar(64) NOT NULL COMMENT '主键', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', +# `MONTH_ID` varchar(8) NOT NULL COMMENT '数据维度：yyyyMM', +# `ORG_ID` varchar(64) NOT NULL COMMENT '网格id', +# `ORG_TYPE` varchar(10) NOT NULL COMMENT '网格：grid;组织：agency', +# `PID` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pid=网格所属组织id;\r\n2)orgType=agency： pid=当前组织的上级组织', +# `PIDS` varchar(255) DEFAULT NULL COMMENT '1)orgType=grid: pids=网格所有上级组织，包括pid;\r\n2)orgType=agency： pids=当前组织的所有上级组织，包括pid.', +# `CATEGORY_CODE` varchar(255) NOT NULL COMMENT '活动分类编码', +# `PARENT_CODE` varchar(255) NOT NULL COMMENT '上级分类编码', +# `LEVEL` int(11) NOT NULL COMMENT '分类等级', +# `ORGANIZE_INCR` int(11) NOT NULL COMMENT '本月内：活动组织次数', +# `PARTICIPATE_USER__INCR` int(11) NOT NULL COMMENT '本月内：活动签到人数参加人数', +# `AVG_PARTICIPATE_USER_INCR` int(11) NOT NULL COMMENT '本月内：平均参加人数', +# `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', +# `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', +# `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', +# `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', +# `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', +# `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', +# PRIMARY KEY (`ID`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='专项组活动(参加人数、组织次数、平均参加人数)按月增量分析'; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql index e83d7f5313..481a0eb97f 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.15__govern.sql @@ -1,110 +1,110 @@ --- epmet_data_statistical新增两张表，治理指数网格按天统计，治理指数按组织按天统计 - -CREATE TABLE `fact_agency_govern_daily` ( - `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+AGENCY_ID+date_id只有一条记录', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ', - `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id', - `LEVEL` varchar(30) NOT NULL COMMENT 'agency_id所属的机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province）', - `PID` varchar(64) NOT NULL COMMENT '组织i所属的组织id', - `PIDS` varchar(255) NOT NULL COMMENT '组织i所有上级id', - `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8', - `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数', - `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前组织内，话题关闭已解决数', - `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前组织内，话题关闭无需解决数', - `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前组织内，议题关闭已解决数', - `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前组织内，议题关闭无需解决数', - `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前组织内：来源于议题的项目：结案已解决数', - `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前组织内：来源于议题的项目：结案无需解决数', - `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前组织内：项目立项，结案已解决数；默认为0，', - `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前组织内：项目立项，结案无需解决数；默认为0，', - `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前组织内，未出小组即未转议题的：话题关闭已解决数', - `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前组织内，未出小组即未转议题的：话题关闭无需解决数', - `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '11、未出当前网格的，结案项目数', - `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由社区结案的项目总数', - `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由街道结案的项目总数', - `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由区直部门结案的项目总数', - `DEL_FLAG` varchar(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`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织的治理指数，按天统计'; - -CREATE TABLE `fact_grid_govern_daily` ( - `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ', - `GRID_ID` varchar(64) NOT NULL COMMENT '网格id', - `PID` varchar(64) NOT NULL COMMENT '网格所属的组织id', - `PIDS` varchar(255) NOT NULL COMMENT '网格所有上级id', - `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8', - `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数', - `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', - `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前网格内，话题关闭已解决数', - `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前网格内，话题关闭无需解决数', - `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前网格内，议题关闭已解决数', - `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前网格内，议题关闭无需解决数', - `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前网格内：来源于议题的项目：结案已解决数', - `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前网格内：来源于议题的项目：结案无需解决数', - `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前网格内：项目立项，结案已解决数；默认为0，', - `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前网格内：项目立项，结案无需解决数；默认为0，', - `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前网格内，未出小组即未转议题的：话题关闭已解决数', - `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前网格内，未出小组即未转议题的：话题关闭无需解决数', - `FROM_ISSUE_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '11、来源于议题的项目，未出网格结案并且已解决的项目数', - `FROM_ISSUE_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '12、来源于议题的项目，未出网格结案并且无需解决的项目数', - `FROM_AGENCY_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0', - `FROM_AGENCY_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0', - `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL COMMENT '15、未出当前网格的，结案项目数=11+12+13+14', - `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数', - `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数', - `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数', - `DEL_FLAG` varchar(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`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='网格的治理指数，按天统计'; - -# 小组成员添加是否是党员 -ALTER TABLE `epmet_data_statistical`.`fact_origin_group_member_daily` - ADD COLUMN `IS_PARTY` tinyint(1) NULL DEFAULT 0 COMMENT '是否是党员' AFTER `ACTION_CODE`; - -# 项目主表添加结案项目是否满意 -ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily` - ADD COLUMN `IS_SATISFIED` tinyint(1) NULL COMMENT '是否满意 1:是' AFTER `IS_OVERDUE`; - -# 添加治理能力按日统计表 -CREATE TABLE `epmet_evaluation_index`.`screen_govern_rank_data_daily` ( - `ID` varchar(64) NOT NULL COMMENT 'ID 主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', - `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id', - `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id', - `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd', - `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid', - `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id', - `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id', - `ORG_NAME` varchar(32) NOT NULL COMMENT '组织名称', - `RESPONSE_RATIO` decimal(10,6) DEFAULT NULL COMMENT '响应率', - `RESOLVED_RATIO` decimal(10,6) DEFAULT NULL COMMENT '解决率', - `GOVERN_RATIO` decimal(10,6) DEFAULT NULL COMMENT '自治率', - `SATISFACTION_RATIO` decimal(10,6) DEFAULT NULL COMMENT '满意率', - `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', - `REVISION` int(11) NOT NULL 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='基层治理-治理能力排行数据(按日统计)'; \ No newline at end of file +# -- epmet_data_statistical新增两张表，治理指数网格按天统计，治理指数按组织按天统计 +# +# CREATE TABLE `fact_agency_govern_daily` ( +# `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+AGENCY_ID+date_id只有一条记录', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', +# `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ', +# `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织id', +# `LEVEL` varchar(30) NOT NULL COMMENT 'agency_id所属的机关级别（社区级：community，\r\n乡（镇、街道）级:street,\r\n区县级: district,\r\n市级: city\r\n省级:province）', +# `PID` varchar(64) NOT NULL COMMENT '组织i所属的组织id', +# `PIDS` varchar(255) NOT NULL COMMENT '组织i所有上级id', +# `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8', +# `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数', +# `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前组织内，话题关闭已解决数', +# `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前组织内，话题关闭无需解决数', +# `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前组织内，议题关闭已解决数', +# `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前组织内，议题关闭无需解决数', +# `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前组织内：来源于议题的项目：结案已解决数', +# `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前组织内：来源于议题的项目：结案无需解决数', +# `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前组织内：项目立项，结案已解决数；默认为0，', +# `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前组织内：项目立项，结案无需解决数；默认为0，', +# `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前组织内，未出小组即未转议题的：话题关闭已解决数', +# `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前组织内，未出小组即未转议题的：话题关闭无需解决数', +# `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL DEFAULT '0' COMMENT '11、未出当前网格的，结案项目数', +# `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由社区结案的项目总数', +# `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由街道结案的项目总数', +# `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前组织内结案的项目中：由区直部门结案的项目总数', +# `DEL_FLAG` varchar(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`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='组织的治理指数，按天统计'; +# +# CREATE TABLE `fact_grid_govern_daily` ( +# `ID` varchar(64) NOT NULL COMMENT '主键，customer_id+grid_id+date_id只有一条记录', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', +# `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd; ', +# `GRID_ID` varchar(64) NOT NULL COMMENT '网格id', +# `PID` varchar(64) NOT NULL COMMENT '网格所属的组织id', +# `PIDS` varchar(255) NOT NULL COMMENT '网格所有上级id', +# `PROBLEM_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '界面展示：问题解决总数=1+2+3+4+5+6+7+8', +# `GROUP_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：党群自治占比=（9+10）/PROBLEM_RESOLVED_COUNT; 此列存储的是小数', +# `GRID_SELF_GOVERN_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：网格自治占比=GRID_SELF_GOVERN_PROJECT_TOTAL/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `COMMUNITY_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：社区解决占比=COMMUNITY_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `STREET_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：街道解决占比=STREET_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `DISTRICT_DEPT_CLOSED_RATIO` decimal(10,6) NOT NULL COMMENT '界面展示：区直部门解决占比=DISTRICT_DEPT_CLOSED_COUNT/PROBLEM_RESOLVED_COUNT；此列存储的是小数', +# `TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '1、当前网格内，话题关闭已解决数', +# `TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '2、当前网格内，话题关闭无需解决数', +# `ISSUE_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '3、当前网格内，议题关闭已解决数', +# `ISSUE_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '4、当前网格内，议题关闭无需解决数', +# `ISSUE_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '5、当前网格内：来源于议题的项目：结案已解决数', +# `ISSUE_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '6、当前网格内：来源于议题的项目：结案无需解决数', +# `APPROVAL_PROJECT_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '7、当前网格内：项目立项，结案已解决数；默认为0，', +# `APPROVAL_PROJECT_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '8、当前网格内：项目立项，结案无需解决数；默认为0，', +# `IN_GROUP_TOPIC_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '9、当前网格内，未出小组即未转议题的：话题关闭已解决数', +# `IN_GROUP_TOPIC_UN_RESOLVED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '10、当前网格内，未出小组即未转议题的：话题关闭无需解决数', +# `FROM_ISSUE_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '11、来源于议题的项目，未出网格结案并且已解决的项目数', +# `FROM_ISSUE_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '12、来源于议题的项目，未出网格结案并且无需解决的项目数', +# `FROM_AGENCY_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '13、来源于项目立项的项目，未出网格结案，并且已解决的项目数；因现在网格不能立项，所以此列默认为0', +# `FROM_AGENCY_UN_RESOLVED_IN_GRID_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '14、来源于项目立项的项目，未出网格结案，并且无需解决的项目数；因现在网格不能立项，所以此列默认为0', +# `GRID_SELF_GOVERN_PROJECT_TOTAL` int(11) NOT NULL COMMENT '15、未出当前网格的，结案项目数=11+12+13+14', +# `COMMUNITY_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由社区结案(已解决+未解决)的项目总数', +# `STREET_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由街道结案(已解决+未解决)的项目总数', +# `DISTRICT_DEPT_CLOSED_COUNT` int(11) NOT NULL DEFAULT '0' COMMENT '当前网格内出来的项目：由区直部门(已解决+未解决)结案的项目总数', +# `DEL_FLAG` varchar(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`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='网格的治理指数，按天统计'; +# +# # 小组成员添加是否是党员 +# ALTER TABLE `epmet_data_statistical`.`fact_origin_group_member_daily` +# ADD COLUMN `IS_PARTY` tinyint(1) NULL DEFAULT 0 COMMENT '是否是党员' AFTER `ACTION_CODE`; +# +# # 项目主表添加结案项目是否满意 +# ALTER TABLE `epmet_data_statistical`.`fact_origin_project_main_daily` +# ADD COLUMN `IS_SATISFIED` tinyint(1) NULL COMMENT '是否满意 1:是' AFTER `IS_OVERDUE`; +# +# # 添加治理能力按日统计表 +# CREATE TABLE `epmet_evaluation_index`.`screen_govern_rank_data_daily` ( +# `ID` varchar(64) NOT NULL COMMENT 'ID 主键', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id', +# `YEAR_ID` varchar(32) NOT NULL COMMENT '年Id', +# `MONTH_ID` varchar(32) NOT NULL COMMENT '月份Id', +# `DATE_ID` varchar(8) NOT NULL COMMENT '数据更新至：yyyyMMdd', +# `ORG_TYPE` varchar(32) NOT NULL DEFAULT 'agency' COMMENT '组织类别 agency：组织；部门：department；网格：grid', +# `ORG_ID` varchar(64) NOT NULL COMMENT '组织Id 可以为网格，机关id', +# `PARENT_ID` varchar(64) NOT NULL COMMENT '上级组织Id', +# `ORG_NAME` varchar(32) NOT NULL COMMENT '组织名称', +# `RESPONSE_RATIO` decimal(10,6) DEFAULT NULL COMMENT '响应率', +# `RESOLVED_RATIO` decimal(10,6) DEFAULT NULL COMMENT '解决率', +# `GOVERN_RATIO` decimal(10,6) DEFAULT NULL COMMENT '自治率', +# `SATISFACTION_RATIO` decimal(10,6) DEFAULT NULL COMMENT '满意率', +# `DEL_FLAG` char(1) NOT NULL DEFAULT '0' COMMENT '删除标识 0未删除；1已删除', +# `REVISION` int(11) NOT NULL 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='基层治理-治理能力排行数据(按日统计)'; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql index 367af0a9b7..36b0235e8a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql @@ -1 +1 @@ -ALTER TABLE `fact_origin_topic_main_daily` ADD `SHIFT_ISSUE` tinyint(1) NOT NULL default '0' COMMENT '是否转为议题，0:false，1:true' AFTER `CREATE_TOPIC_USER_IS_PARTY`; \ No newline at end of file +# ALTER TABLE `fact_origin_topic_main_daily` ADD `SHIFT_ISSUE` tinyint(1) NOT NULL default '0' COMMENT '是否转为议题，0:false，1:true' AFTER `CREATE_TOPIC_USER_IS_PARTY`; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql index 15cca09546..fcd6893485 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql @@ -1,113 +1,113 @@ -CREATE TABLE `index_explain` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `TITLE` varchar(32) NOT NULL COMMENT '名称', - `INDEX_CODE` varchar(256) NOT NULL COMMENT '指标code', - `MEANING` varchar(256) NOT NULL COMMENT '含义', - `ORG_LEVEL` varchar(16) NOT NULL COMMENT '组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）', - `PID` varchar(16) NOT NULL COMMENT '父ID', - `SORT` int(11) NOT NULL COMMENT '排序', - `IS_SEARCH` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否需要查询；1有；0:无；', - `TYPE` varchar(16) NOT NULL DEFAULT 'none' COMMENT '数据类型：none；本级：self；下级：sub', - `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标记 0：未删除，1：已删除', - `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL DEFAULT 'app_user' COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='指标说明文案'; - -#插入指标结束 -BEGIN; -INSERT INTO `index_explain` VALUES ('1', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'grid', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('10', 'default', '1/2下级党建指数得分', 'shequxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'community', '8', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('11', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'community', '0', 4, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('12', 'default', '2/1本级治理指数得分', 'shequxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'community', '11', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('13', 'default', '2/2下级治理指数得分', 'shequxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'community', '11', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('14', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'community', '0', 3, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('15', 'default', '3/1本级服务指数得分', 'shequxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'community', '14', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('16', 'default', '3/2下级服务指数得分', 'shequxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'community', '14', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('17', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'street', '0', 5, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('18', 'default', '1/1本级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'street', '17', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('19', 'default', '1/2下级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'street', '17', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('2', 'default', '1/1本级党建指数得分', 'wanggexiangguan:dangjiannengli', '本级党建指数得分=网格各项党建指数指标数据得分*相关权重之和', 'grid', '1', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('20', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'street', '0', 6, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('21', 'default', '2/1本级治理指数得分', 'jiedaoxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'street', '20', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('22', 'default', '2/2下级治理指数得分', 'jiedaoxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'street', '20', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('23', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'street', '0', 7, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('24', 'default', '3/1本级服务指数得分', 'jiedaoxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'street', '23', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('25', 'default', '3/2下级服务指数得分', 'jiedaoxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'street', '23', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('26', 'default', '党建指数', '', '含义：自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'district', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('27', 'default', '1/1本级党建指数得分', 'quanquxiangguan:dangjiannengli', '本级党建指数得分=区名义发文数量得分*相关权重', 'district', '26', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('28', 'default', '1/2下级党建指数得分', 'quanquxiangguan:dangjiannengli', '下级党建指数得分=区下级街道党建指数汇总（平均值）*相关权重', 'district', '26', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('29', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=所有街道治理指数（平均值）*相关权重（d%）+所有直属部门治理指数（平均值）*相关权重（d%）', 'district', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('3', 'default', '1/2下级党建指数得分', 'dangyuanxiangguan:lianxiqunzhong', '下级党建指数得分=组织内党员的联系群众指数考评分（平均值）*相关权重', 'grid', '1', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('30', 'default', '2/1所有街道治理指数（平均值）', 'quanquxiangguan:zhilinengli', '所有街道治理指数（平均值）得分=区下级所有街道治理指数得分总和/街道总数', 'district', '29', 1, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('31', 'default', '2/2所有直属部门治理指数（平均值）', 'quzhibumen:zhilinengli', '所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和', 'district', '29', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('32', 'default', '服务指数', 'quanquxiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=区下属街道服务指数汇总（平均值）=区下属所有街道服务指数得分之和/街道总数', 'district', '0', 3, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('4', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'grid', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('5', 'default', '2/1本级治理指数得分', 'wanggexiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'grid', '4', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('6', 'default', '2/2下级治理指数得分', 'dangyuanxiangguan:canyuyishi', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'grid', '4', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('7', 'default', '服务指数', 'wanggexiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=活动组织次数得分*相关权重+志愿者占比得分*相关权重+党员志愿者率得分*相关权重', 'grid', '0', 3, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('8', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'community', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -INSERT INTO `index_explain` VALUES ('9', 'default', '1/1本级党建指数得分', 'shequxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'community', '8', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); -COMMIT; - -#更新含义 -update index_dict SET INDEX_DESC='自然月周期内，网格内注册群众用户数。' WHERE INDEX_CODE = 'wanggequnzhongyhs'; -update index_dict SET INDEX_DESC='自然月周期内，网格内注册党员用户数。' WHERE INDEX_CODE = 'wanggedangyuanyhs'; -update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的群众用户。' WHERE INDEX_CODE = 'wanggehuoyueqzyhs'; -update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的党员用户。' WHERE INDEX_CODE = 'wanggehuoyuedyyhs'; -update index_dict SET INDEX_DESC='自然月周期内，网格内党员提出的总话题数与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtchts'; -update index_dict SET INDEX_DESC='自然月周期内，网格内群众提出的总话题数与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtchts'; -update index_dict SET INDEX_DESC='自然月周期内，网格内所有党员提出的议题转为项目的数目与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtcdytzxms'; -update index_dict SET INDEX_DESC='自然月周期内，网格内所有群众提出的议题转为项目的数目与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtcdytzxms'; -update index_dict SET INDEX_DESC='自然月周期内，党员自建群（群主）数量。' WHERE INDEX_CODE = 'jianqundangyuans'; -update index_dict SET INDEX_DESC='自然月周期内，党员自建群群众人数乘相关权重、党员自建群活跃群众人数乘相关权重、党员自建群活跃度-话题数乘相关权重与自建群活跃度-议题转项目率乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; -update index_dict SET INDEX_DESC='自然月周期内，网格内所有发文数量' WHERE INDEX_CODE = 'wanggedifawsl'; -update index_dict SET INDEX_DESC='自然月周期内，已转项目议题数与近两个自然月内议题总数之比' WHERE INDEX_CODE = 'wanggeyitizxml'; -update index_dict SET INDEX_DESC='自然月周期内，本网格内注册党员活动签到次数。' WHERE INDEX_CODE = 'dangyuancanjiashykrc'; -update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'xiashusuoyouwgddjnlpjz'; -update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqdjnlhzpjz'; -update index_dict SET INDEX_DESC='自然月周期内，街道内所有发文数量' WHERE INDEX_CODE = 'jiedaomingyifwsl'; -update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道党建指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiajijieddjnlhzpjz'; -update index_dict SET INDEX_DESC='自然月周期内，区内所有发文数量' WHERE INDEX_CODE = 'qumingyifawsl'; -update index_dict SET INDEX_DESC='自然月周期内，党员提出话题数乘相关权重、党员参与话题数乘相关权重、党员提出的话题转议题数乘相关权重与党员提出的议题转项目数乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydcyysnlkpfpjz'; -update index_dict SET INDEX_DESC='自然月周期内，网格内成员提出议题的总数量' WHERE INDEX_CODE = 'wanggezongyitsm'; -update index_dict SET INDEX_DESC='自然月周期内，新增议题数与发布议题人数去重之比' WHERE INDEX_CODE = 'wanggerenjunytsm'; -update index_dict SET INDEX_DESC='自然月周期内，议题转化的项目数' WHERE INDEX_CODE = 'wanggezongxiangms'; -update index_dict SET INDEX_DESC='自然月周期内，从议题创建到项目关闭，包括处理人，没有出过议题所属网格的项目数。' WHERE INDEX_CODE = 'wanggezizhixms'; -update index_dict SET INDEX_DESC='自然月周期内，办结的项目数' WHERE INDEX_CODE = 'wanggebanjiexms'; -update index_dict SET INDEX_DESC='自然月周期内，未被退回的项目数与项目总数之比' WHERE INDEX_CODE = 'wanggechuishaobmzql'; -update index_dict SET INDEX_DESC='自然月周期内，网格内自治办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'wanggeneijiejdxmdmyd'; -update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格治理指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiashusywgzlnlhzpjz'; -update index_dict SET INDEX_DESC='自然月周期内，社区被吹哨的次数' WHERE INDEX_CODE = 'shequbeichuiscs'; -update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexms'; -update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'shequxiangmuxyd'; -update index_dict SET INDEX_DESC='自然月周期内，超期项目数与结案项目数之比' WHERE INDEX_CODE = 'shequchaoqixml'; -update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexml'; -update index_dict SET INDEX_DESC='自然月周期内，社区级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'shequbanjiexmmyd'; -update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区治理指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqzlnlhz'; -update index_dict SET INDEX_DESC='自然月周期内，街道被吹哨的次数' WHERE INDEX_CODE = 'jiedaobeichuiscs'; -update index_dict SET INDEX_DESC='自然月周期内，街道办结项目数目' WHERE INDEX_CODE = 'jiedaobanjiexms'; -update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'jiedaoxiangmuxyd'; -update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'jiedaobanjiexmdclxl'; -update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目数目与街道级尚未办结的项目数的比例' WHERE INDEX_CODE = 'jiedaoxiangmubjl'; -update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'jiedaojixiangmmyd'; -update index_dict SET INDEX_DESC='自然月周期内，区直部门被吹哨的次数' WHERE INDEX_CODE = 'quzhibumenbcscs'; -update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目' WHERE INDEX_CODE = 'quzhibumenbjxms'; -update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'quzhibumenxmxyd'; -update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'quzhibumenbjxmdclxl'; -update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目与区直部门尚未办结的项目数的比例' WHERE INDEX_CODE = 'quzhibumenxmbjl'; -update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'quzhibumenxmmyd'; -update index_dict SET INDEX_DESC='所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和' WHERE INDEX_CODE = 'suoyouzhishubmzlnlpjz'; -update index_dict SET INDEX_DESC='自然月周期内，网格内爱心活动组织次数。' WHERE INDEX_CODE = 'wanggehuodongzzcs'; -update index_dict SET INDEX_DESC='自然月周期内，志愿者内党员数与志愿者总数之比' WHERE INDEX_CODE = 'wanggezhiyuanzzb'; -update index_dict SET INDEX_DESC='自然月周期内，网格内党员志愿者总数与网格党员总人数之比。' WHERE INDEX_CODE = 'wanggedangyuanzyzl'; -update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格服务指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiajisywgfwnldfpjz'; -update index_dict SET INDEX_DESC='自然月周期内，社区内爱心活动组织次数。' WHERE INDEX_CODE = 'shequhuodongzzcs'; -update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区服务指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusqfwnldfpjz'; -update index_dict SET INDEX_DESC='自然月周期内，街道内爱心活动组织次数。' WHERE INDEX_CODE = 'jiedaohuodongzzcs'; -update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道服务指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiashujiedfwnlhzpjz'; - +# CREATE TABLE `index_explain` ( +# `ID` varchar(64) NOT NULL COMMENT '主键', +# `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', +# `TITLE` varchar(32) NOT NULL COMMENT '名称', +# `INDEX_CODE` varchar(256) NOT NULL COMMENT '指标code', +# `MEANING` varchar(256) NOT NULL COMMENT '含义', +# `ORG_LEVEL` varchar(16) NOT NULL COMMENT '组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）', +# `PID` varchar(16) NOT NULL COMMENT '父ID', +# `SORT` int(11) NOT NULL COMMENT '排序', +# `IS_SEARCH` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否需要查询；1有；0:无；', +# `TYPE` varchar(16) NOT NULL DEFAULT 'none' COMMENT '数据类型：none；本级：self；下级：sub', +# `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标记 0：未删除，1：已删除', +# `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', +# `CREATED_BY` varchar(32) NOT NULL DEFAULT 'app_user' COMMENT '创建人', +# `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', +# `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', +# `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', +# PRIMARY KEY (`ID`) USING BTREE +# ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='指标说明文案'; +# +# #插入指标结束 +# BEGIN; +# INSERT INTO `index_explain` VALUES ('1', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'grid', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('10', 'default', '1/2下级党建指数得分', 'shequxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'community', '8', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('11', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'community', '0', 4, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('12', 'default', '2/1本级治理指数得分', 'shequxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'community', '11', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('13', 'default', '2/2下级治理指数得分', 'shequxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'community', '11', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('14', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'community', '0', 3, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('15', 'default', '3/1本级服务指数得分', 'shequxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'community', '14', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('16', 'default', '3/2下级服务指数得分', 'shequxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'community', '14', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('17', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'street', '0', 5, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('18', 'default', '1/1本级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'street', '17', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('19', 'default', '1/2下级党建指数得分', 'jiedaoxiangguan:dangjiannengli', '下级党建指数得分=下级所有网格党建指数的平均值*相关权重', 'street', '17', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('2', 'default', '1/1本级党建指数得分', 'wanggexiangguan:dangjiannengli', '本级党建指数得分=网格各项党建指数指标数据得分*相关权重之和', 'grid', '1', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('20', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'street', '0', 6, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('21', 'default', '2/1本级治理指数得分', 'jiedaoxiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'street', '20', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('22', 'default', '2/2下级治理指数得分', 'jiedaoxiangguan:zhilinengli', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'street', '20', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('23', 'default', '服务指数', '', '含义：自然月周期内，服务指数得分=本级服务指数得分+下级服务指数得分', 'street', '0', 7, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('24', 'default', '3/1本级服务指数得分', 'jiedaoxiangguan:fuwunengli', '本级服务指数得分=社区活动组织次数得分*相关权重', 'street', '23', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('25', 'default', '3/2下级服务指数得分', 'jiedaoxiangguan:fuwunengli', '下级服务指数得分=社区下级所有网格服务指数得分（平均值）*相关权重', 'street', '23', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('26', 'default', '党建指数', '', '含义：自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'district', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('27', 'default', '1/1本级党建指数得分', 'quanquxiangguan:dangjiannengli', '本级党建指数得分=区名义发文数量得分*相关权重', 'district', '26', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('28', 'default', '1/2下级党建指数得分', 'quanquxiangguan:dangjiannengli', '下级党建指数得分=区下级街道党建指数汇总（平均值）*相关权重', 'district', '26', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('29', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=所有街道治理指数（平均值）*相关权重（d%）+所有直属部门治理指数（平均值）*相关权重（d%）', 'district', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('3', 'default', '1/2下级党建指数得分', 'dangyuanxiangguan:lianxiqunzhong', '下级党建指数得分=组织内党员的联系群众指数考评分（平均值）*相关权重', 'grid', '1', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('30', 'default', '2/1所有街道治理指数（平均值）', 'quanquxiangguan:zhilinengli', '所有街道治理指数（平均值）得分=区下级所有街道治理指数得分总和/街道总数', 'district', '29', 1, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('31', 'default', '2/2所有直属部门治理指数（平均值）', 'quzhibumen:zhilinengli', '所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和', 'district', '29', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('32', 'default', '服务指数', 'quanquxiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=区下属街道服务指数汇总（平均值）=区下属所有街道服务指数得分之和/街道总数', 'district', '0', 3, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('4', 'default', '治理指数', '', '含义：自然月周期内，治理指数得分=本级治理指数得分+下级治理指数得分', 'grid', '0', 2, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('5', 'default', '2/1本级治理指数得分', 'wanggexiangguan:zhilinengli', '本级治理指数得分=网格各项治理指数指标数据得分*相关权重之和', 'grid', '4', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('6', 'default', '2/2下级治理指数得分', 'dangyuanxiangguan:canyuyishi', '下级治理指数得分=组织内党员的参与议事指数考评分（平均值）*相关权重', 'grid', '4', 2, 1, 'xiaji', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('7', 'default', '服务指数', 'wanggexiangguan:fuwunengli', '含义：自然月周期内，服务指数得分=活动组织次数得分*相关权重+志愿者占比得分*相关权重+党员志愿者率得分*相关权重', 'grid', '0', 3, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('8', 'default', '党建指数', '', '自然月周期内，党建指数得分=本级党建指数得分+下级党建指数得分', 'community', '0', 1, 0, 'none', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# INSERT INTO `index_explain` VALUES ('9', 'default', '1/1本级党建指数得分', 'shequxiangguan:dangjiannengli', '本级党建指数得分=社区名义发文数量得分*相关权重', 'community', '8', 1, 1, 'zishen', '0', 0, 'app_user', '2021-05-12 14:25:14', 'app_user', '2021-05-12 14:25:16'); +# COMMIT; +# +# #更新含义 +# update index_dict SET INDEX_DESC='自然月周期内，网格内注册群众用户数。' WHERE INDEX_CODE = 'wanggequnzhongyhs'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内注册党员用户数。' WHERE INDEX_CODE = 'wanggedangyuanyhs'; +# update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的群众用户。' WHERE INDEX_CODE = 'wanggehuoyueqzyhs'; +# update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的党员用户。' WHERE INDEX_CODE = 'wanggehuoyuedyyhs'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内党员提出的总话题数与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtchts'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内群众提出的总话题数与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtchts'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内所有党员提出的议题转为项目的数目与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtcdytzxms'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内所有群众提出的议题转为项目的数目与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtcdytzxms'; +# update index_dict SET INDEX_DESC='自然月周期内，党员自建群（群主）数量。' WHERE INDEX_CODE = 'jianqundangyuans'; +# update index_dict SET INDEX_DESC='自然月周期内，党员自建群群众人数乘相关权重、党员自建群活跃群众人数乘相关权重、党员自建群活跃度-话题数乘相关权重与自建群活跃度-议题转项目率乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内所有发文数量' WHERE INDEX_CODE = 'wanggedifawsl'; +# update index_dict SET INDEX_DESC='自然月周期内，已转项目议题数与近两个自然月内议题总数之比' WHERE INDEX_CODE = 'wanggeyitizxml'; +# update index_dict SET INDEX_DESC='自然月周期内，本网格内注册党员活动签到次数。' WHERE INDEX_CODE = 'dangyuancanjiashykrc'; +# update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'xiashusuoyouwgddjnlpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqdjnlhzpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，街道内所有发文数量' WHERE INDEX_CODE = 'jiedaomingyifwsl'; +# update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道党建指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiajijieddjnlhzpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，区内所有发文数量' WHERE INDEX_CODE = 'qumingyifawsl'; +# update index_dict SET INDEX_DESC='自然月周期内，党员提出话题数乘相关权重、党员参与话题数乘相关权重、党员提出的话题转议题数乘相关权重与党员提出的议题转项目数乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydcyysnlkpfpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内成员提出议题的总数量' WHERE INDEX_CODE = 'wanggezongyitsm'; +# update index_dict SET INDEX_DESC='自然月周期内，新增议题数与发布议题人数去重之比' WHERE INDEX_CODE = 'wanggerenjunytsm'; +# update index_dict SET INDEX_DESC='自然月周期内，议题转化的项目数' WHERE INDEX_CODE = 'wanggezongxiangms'; +# update index_dict SET INDEX_DESC='自然月周期内，从议题创建到项目关闭，包括处理人，没有出过议题所属网格的项目数。' WHERE INDEX_CODE = 'wanggezizhixms'; +# update index_dict SET INDEX_DESC='自然月周期内，办结的项目数' WHERE INDEX_CODE = 'wanggebanjiexms'; +# update index_dict SET INDEX_DESC='自然月周期内，未被退回的项目数与项目总数之比' WHERE INDEX_CODE = 'wanggechuishaobmzql'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内自治办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'wanggeneijiejdxmdmyd'; +# update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格治理指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiashusywgzlnlhzpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，社区被吹哨的次数' WHERE INDEX_CODE = 'shequbeichuiscs'; +# update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexms'; +# update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'shequxiangmuxyd'; +# update index_dict SET INDEX_DESC='自然月周期内，超期项目数与结案项目数之比' WHERE INDEX_CODE = 'shequchaoqixml'; +# update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexml'; +# update index_dict SET INDEX_DESC='自然月周期内，社区级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'shequbanjiexmmyd'; +# update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区治理指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqzlnlhz'; +# update index_dict SET INDEX_DESC='自然月周期内，街道被吹哨的次数' WHERE INDEX_CODE = 'jiedaobeichuiscs'; +# update index_dict SET INDEX_DESC='自然月周期内，街道办结项目数目' WHERE INDEX_CODE = 'jiedaobanjiexms'; +# update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'jiedaoxiangmuxyd'; +# update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'jiedaobanjiexmdclxl'; +# update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目数目与街道级尚未办结的项目数的比例' WHERE INDEX_CODE = 'jiedaoxiangmubjl'; +# update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'jiedaojixiangmmyd'; +# update index_dict SET INDEX_DESC='自然月周期内，区直部门被吹哨的次数' WHERE INDEX_CODE = 'quzhibumenbcscs'; +# update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目' WHERE INDEX_CODE = 'quzhibumenbjxms'; +# update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'quzhibumenxmxyd'; +# update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'quzhibumenbjxmdclxl'; +# update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目与区直部门尚未办结的项目数的比例' WHERE INDEX_CODE = 'quzhibumenxmbjl'; +# update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'quzhibumenxmmyd'; +# update index_dict SET INDEX_DESC='所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和' WHERE INDEX_CODE = 'suoyouzhishubmzlnlpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内爱心活动组织次数。' WHERE INDEX_CODE = 'wanggehuodongzzcs'; +# update index_dict SET INDEX_DESC='自然月周期内，志愿者内党员数与志愿者总数之比' WHERE INDEX_CODE = 'wanggezhiyuanzzb'; +# update index_dict SET INDEX_DESC='自然月周期内，网格内党员志愿者总数与网格党员总人数之比。' WHERE INDEX_CODE = 'wanggedangyuanzyzl'; +# update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格服务指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiajisywgfwnldfpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，社区内爱心活动组织次数。' WHERE INDEX_CODE = 'shequhuodongzzcs'; +# update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区服务指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusqfwnldfpjz'; +# update index_dict SET INDEX_DESC='自然月周期内，街道内爱心活动组织次数。' WHERE INDEX_CODE = 'jiedaohuodongzzcs'; +# update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道服务指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiashujiedfwnlhzpjz'; +# diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql index 1bbb8b6e4c..deb2572649 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.18__modify_index_weight_for_3.0.sql @@ -1,22 +1,22 @@ -#修改党员相关 三会一课权重 -UPDATE index_group_detail_template SET WEIGHT = 0.1 WHERE INDEX_CODE = 'dangwuhuodong'; -UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'canyuyishi'; -UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'lianxiqunzhong'; -UPDATE index_group_detail_template SET WEIGHT = 1 WHERE INDEX_CODE = 'canjiasanhykcs'; - -UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; -UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'wanggedifawsl'; -UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'zuzhisanhykcs'; -UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'dangyuancanjiashykrc'; - -#开发和测试的 对应的客户已经修改执行完了 -#修改生产的 先给党群e事通和亿联员工互助会设置一下权重。再加上我们自己的 微笑崂山 -UPDATE index_group_detail SET WEIGHT = 0.1 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangwuhuodong'; -UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canyuyishi'; -UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'lianxiqunzhong'; -UPDATE index_group_detail SET WEIGHT = 1 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canjiasanhykcs'; - -UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; -UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'wanggedifawsl'; -UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhisanhykcs'; -UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangyuancanjiashykrc'; +# #修改党员相关 三会一课权重 +# UPDATE index_group_detail_template SET WEIGHT = 0.1 WHERE INDEX_CODE = 'dangwuhuodong'; +# UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'canyuyishi'; +# UPDATE index_group_detail_template SET WEIGHT = 0.45 WHERE INDEX_CODE = 'lianxiqunzhong'; +# UPDATE index_group_detail_template SET WEIGHT = 1 WHERE INDEX_CODE = 'canjiasanhykcs'; +# +# UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; +# UPDATE index_group_detail_template SET WEIGHT = 0.26 WHERE INDEX_CODE = 'wanggedifawsl'; +# UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'zuzhisanhykcs'; +# UPDATE index_group_detail_template SET WEIGHT = 0.04 WHERE INDEX_CODE = 'dangyuancanjiashykrc'; +# +# #开发和测试的 对应的客户已经修改执行完了 +# #修改生产的 先给党群e事通和亿联员工互助会设置一下权重。再加上我们自己的 微笑崂山 +# UPDATE index_group_detail SET WEIGHT = 0.1 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangwuhuodong'; +# UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canyuyishi'; +# UPDATE index_group_detail SET WEIGHT = 0.45 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'lianxiqunzhong'; +# UPDATE index_group_detail SET WEIGHT = 1 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'canjiasanhykcs'; +# +# UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz'; +# UPDATE index_group_detail SET WEIGHT = 0.26 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'wanggedifawsl'; +# UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'zuzhisanhykcs'; +# UPDATE index_group_detail SET WEIGHT = 0.04 WHERE CUSTOMER_ID IN ('7ae84f0ceb36397f5078187d72de3403','04c0d396e298f13e57aa5904a657eaa6','3fdd0380deff5b30f45376cdf995d1c1') AND INDEX_CODE = 'dangyuancanjiashykrc'; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql index 5d470eaec9..fecb05a6c4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.19__add_gridMemberToalColumn.sql @@ -1,4 +1,4 @@ --- 为了平阴大屏，显示网格员数，screen_user_total_data 新增GRID_MEMBER_TOTAL - --- epmet_evaluation_index 、 epmet_data_statistical_display 库执行以下： -ALTER TABLE screen_user_total_data ADD COLUMN `GRID_MEMBER_TOTAL` INT ( 11 ) NOT NULL DEFAULT '0' COMMENT '06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数' AFTER PROJECT_TOTAL; \ No newline at end of file +# -- 为了平阴大屏，显示网格员数，screen_user_total_data 新增GRID_MEMBER_TOTAL +# +# -- epmet_evaluation_index 、 epmet_data_statistical_display 库执行以下： +# ALTER TABLE screen_user_total_data ADD COLUMN `GRID_MEMBER_TOTAL` INT ( 11 ) NOT NULL DEFAULT '0' COMMENT '06.01新增：orgType=agency或者grid的时候，此列赋值:当前组织或者当前网格内的网格员人数' AFTER PROJECT_TOTAL; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml index 64682b5dd4..94ed20f557 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml @@ -539,58 +539,72 @@ a.count AS "sum", IFNULL( b.count, 0 ) AS "count" FROM - ( SELECT - GRID_ID, - COUNT( ID ) AS "count" - FROM - fact_origin_project_main_daily - WHERE - CUSTOMER_ID = #{customerId} - AND MONTH_ID = #{monthId} - AND GRID_ID != '' - GROUP BY GRID_ID ) a - LEFT JOIN - ( SELECT + ( + SELECT GRID_ID, COUNT( ID ) AS "count" - FROM fact_origin_project_main_daily + FROM + fact_origin_project_main_daily WHERE - PROJECT_STATUS = 'closed' - AND CUSTOMER_ID = #{customerId} + CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} AND GRID_ID != '' - GROUP BY GRID_ID ) b - ON a.GRID_ID = b.GRID_ID + GROUP BY + GRID_ID ) a + LEFT JOIN ( + SELECT + a.GRID_ID, + COUNT( a.ID ) AS "count" + FROM + fact_origin_project_main_daily a + INNER JOIN fact_origin_project_log_daily b ON a.ID = b.PROJECT_ID + AND b.CUSTOMER_ID = #{customerId} + AND b.ACTION_CODE = 'close' + AND b.MONTH_ID = #{monthId} + WHERE + a.PROJECT_STATUS = 'closed' + AND a.CUSTOMER_ID = #{customerId} + AND a.MONTH_ID = #{monthId} + AND a.GRID_ID != '' + GROUP BY + GRID_ID) b ON a.GRID_ID = b.GRID_ID diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml index 07226b1c40..06e5479396 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml @@ -197,110 +197,158 @@ diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml index 088bfeb2dd..c6d7c0d65c 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-activiti-server: container_name: epmet-activiti-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:0.3.0 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-activiti-server:0.3.1 ports: - "8086:8086" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml index b1218dbe2c..fa8fd80209 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/pom.xml @@ -278,7 +278,7 @@ false - false + true true diff --git a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml index bbf8441c97..bdbb5be1ee 100644 --- a/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: common-service-server: container_name: common-service-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.26 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/common-service-server:0.3.41 ports: - "8103:8103" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-common-service/common-service-server/pom.xml b/epmet-module/epmet-common-service/common-service-server/pom.xml index 4e27c15d03..f3de138c12 100644 --- a/epmet-module/epmet-common-service/common-service-server/pom.xml +++ b/epmet-module/epmet-common-service/common-service-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.26 + 0.3.41 com.epmet epmet-common-service @@ -261,7 +261,7 @@ false - false + true true diff --git a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml index 7ba47e2fc3..caa3059dad 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-ext-server: container_name: epmet-ext-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.13 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-ext-server:0.0.20 ports: - "8113:8113" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-ext/epmet-ext-server/pom.xml b/epmet-module/epmet-ext/epmet-ext-server/pom.xml index bebc41ab98..e0d4e979b0 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/pom.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.13 + 0.0.20 com.epmet @@ -340,7 +340,7 @@ false - false + true true diff --git a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml index c31a8c85a3..e2cec97f9c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-heart-server: container_name: epmet-heart-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.57 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-heart-server:0.0.64 ports: - "8111:8111" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 648896a0c9..3aeab54847 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.57 + 0.0.64 com.epmet epmet-heart @@ -269,7 +269,7 @@ false - false + true true https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml index eb51914b5a..13962e8e3a 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.29 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-job-server:0.3.43 ports: - "8084:8084" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 769cfab32a..4ebf4f1fd3 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.29 + 0.3.43 com.epmet epmet-job @@ -251,7 +251,7 @@ - false + true true diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml index 23750b4168..b2d13dc34c 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.33 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-message-server:0.3.53 ports: - "8085:8085" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 87d40ea5fb..622c443eb5 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.33 + 0.3.53 com.epmet epmet-message @@ -332,7 +332,7 @@ - false + true true diff --git a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml index c58715456a..88849c5796 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml @@ -3,7 +3,7 @@ services: epmet-oss-server: container_name: epmet-oss-server-prod # image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-test/epmet-oss-server:0.3.2 - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.28 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-oss-server:0.3.38 ports: - "8083:8083" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-oss/epmet-oss-server/pom.xml b/epmet-module/epmet-oss/epmet-oss-server/pom.xml index e8b08e97cc..5883128ed8 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/pom.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.28 + 0.3.38 com.epmet epmet-oss @@ -260,7 +260,7 @@ false - false + true true diff --git a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml index fb22688a83..7203606525 100644 --- a/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-point-server: container_name: epmet-point-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.42 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-point-server:0.0.60 ports: - "8112:8112" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-point/epmet-point-server/pom.xml b/epmet-module/epmet-point/epmet-point-server/pom.xml index 1a4f6eb6f9..89c84eb878 100644 --- a/epmet-module/epmet-point/epmet-point-server/pom.xml +++ b/epmet-module/epmet-point/epmet-point-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.0.44 + 0.0.60 epmet-point com.epmet @@ -284,7 +284,7 @@ false - false + true true diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java index e7b476d99d..45ac10f2ba 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointStatisticalDailyServiceImpl.java @@ -55,6 +55,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -202,18 +203,22 @@ public class UserPointStatisticalDailyServiceImpl extends BaseServiceImpl userIds = rankList.stream().map(ResiPointRankResultDTO::getUserId).collect(Collectors.toList()); //查询用户昵称 - Result> userInfo = - epmetUserOpenFeignClient.queryUserBaseInfo(userIds); - boolean userRequestCallback = userInfo.success() && null != userInfo.getData() && !userInfo.getData().isEmpty(); - - for (int i = NumConstant.ZERO; i < rankList.size(); i++) { - ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o,ResiPointRankListResultDTO.class); + Result> userInfo = epmetUserOpenFeignClient.queryUserBaseInfo(userIds); + Map userInfoMap = new HashMap<>(); + if (userInfo.success() && CollectionUtils.isNotEmpty(userInfo.getData())){ + userInfoMap = userInfo.getData().stream().collect(Collectors.toMap(UserBaseInfoResultDTO::getUserId, Function.identity(),(o1,o2)->o1)); + } + for (ResiPointRankResultDTO resiPointRankResultDTO : rankList) { + ResiPointRankListResultDTO resultObj = ConvertUtils.sourceToTarget(o, ResiPointRankListResultDTO.class); ResiPointRankingResultDTO target = new ResiPointRankingResultDTO(); - target.setRanking(rankList.get(i).getRank()); - target.setPoint(rankList.get(i).getTotalPoint()); - if(userRequestCallback) { - target.setNickname(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getNickname()); - target.setHeadImgUrl(null == userInfo.getData().get(i) ? "" : userInfo.getData().get(i).getHeadImgUrl()); + target.setRanking(resiPointRankResultDTO.getRank()); + target.setPoint(resiPointRankResultDTO.getTotalPoint()); + target.setNickname(StrConstant.EPMETY_STR); + target.setHeadImgUrl(StrConstant.EPMETY_STR); + UserBaseInfoResultDTO infoResultDTO = userInfoMap.get(resiPointRankResultDTO.getUserId()); + if (infoResultDTO != null) { + target.setNickname(infoResultDTO.getNickname()); + target.setHeadImgUrl(infoResultDTO.getHeadImgUrl()); } resultObj.setRankList(target); result.add(resultObj); diff --git a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml index 60c4577050..ca794b67dc 100644 --- a/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml +++ b/epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-third-server: container_name: epmet-third-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.157 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-third-server:0.0.179 ports: - "8110:8110" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/epmet-third/epmet-third-server/pom.xml b/epmet-module/epmet-third/epmet-third-server/pom.xml index a885af4c93..a57a1bcfcf 100644 --- a/epmet-module/epmet-third/epmet-third-server/pom.xml +++ b/epmet-module/epmet-third/epmet-third-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.0.157 + 0.0.179 com.epmet @@ -320,7 +320,7 @@ false - false + true true diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml index f8d0f80e18..9d6e4d7ae6 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.45 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-access-server:0.3.61 ports: - "8099:8099" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 28e033fa3b..35f2a95c85 100644 --- a/epmet-module/gov-access/gov-access-server/pom.xml +++ b/epmet-module/gov-access/gov-access-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.45 + 0.3.61 gov-access com.epmet @@ -239,7 +239,7 @@ false - false + true true @@ -251,4 +251,4 @@ - \ No newline at end of file + diff --git a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml index bade332658..8401604cf7 100644 --- a/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-grid/gov-grid-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-grid-server: container_name: gov-grid-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.40 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-grid-server:0.3.49 ports: - "8097:8097" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-grid/gov-grid-server/pom.xml b/epmet-module/gov-grid/gov-grid-server/pom.xml index 0e81d0360b..3e4eac304b 100644 --- a/epmet-module/gov-grid/gov-grid-server/pom.xml +++ b/epmet-module/gov-grid/gov-grid-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.40 + 0.3.49 com.epmet gov-grid @@ -219,7 +219,7 @@ false - false + true true diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml index 802b7df8c9..fd568a02f5 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.60 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-issue-server:0.3.90 ports: - "8101:8101" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index a28e3463a8..e1f0aa429e 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.60 + 0.3.90 gov-issue com.epmet @@ -292,7 +292,7 @@ false - false + true true https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml index 2bb561026b..9e3c87d67b 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.36 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-mine-server:0.3.47 ports: - "8098:8098" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index b8206f3b95..c643659b07 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.36 + 0.3.47 com.epmet gov-mine @@ -233,7 +233,7 @@ false - false + true diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml index a42028726b..256ac7b0e6 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.97 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-org-server:0.3.132 ports: - "8092:8092" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 7b2a84d8dd..0177e4b4cd 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.97 + 0.3.132 com.epmet gov-org @@ -323,7 +323,7 @@ false - false + true true diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml index d472c2ac26..e7d2bcac22 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.48 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-project-server:0.3.83 ports: - "8102:8102" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index f49d89d16a..c04583b7d5 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.48 + 0.3.83 gov-project com.epmet @@ -287,7 +287,7 @@ false - false + true true https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml index 3dff43db41..d5a6908cd6 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.69 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/gov-voice-server:0.3.78 ports: - "8105:8105" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 0403af0463..305075f3a6 100644 --- a/epmet-module/gov-voice/gov-voice-server/pom.xml +++ b/epmet-module/gov-voice/gov-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.69 + 0.3.78 gov-voice com.epmet @@ -250,7 +250,7 @@ false - false + true true https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml index 74d27bd4c8..75981232fc 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/deploy/docker-compose-prod.yml @@ -2,9 +2,9 @@ version: "3.7" services: gov-voice-server: container_name: open-data-worker-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.1 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/open-data-worker-server:0.3.13 ports: - - "8107:8107" + - "8117:8117" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/prod:/logs" @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml index 855babdf18..79a89eac66 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.1 + 0.3.13 open-data-worker com.epmet diff --git a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml index 94231275a1..2d0c1631c4 100644 --- a/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-access/oper-access-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-access-server: container_name: oper-access-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.18 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-access-server:0.3.24 ports: - "8093:8093" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/oper-access/oper-access-server/pom.xml b/epmet-module/oper-access/oper-access-server/pom.xml index 147992b041..8d3c8706e8 100644 --- a/epmet-module/oper-access/oper-access-server/pom.xml +++ b/epmet-module/oper-access/oper-access-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - 0.3.19 + 0.3.24 oper-access com.epmet @@ -235,7 +235,7 @@ false - false + true true diff --git a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml index 3282657fca..9cc48783a1 100644 --- a/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml +++ b/epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: oper-crm-server: container_name: oper-crm-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.72 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/oper-crm-server:0.3.87 ports: - "8090:8090" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/oper-crm/oper-crm-server/pom.xml b/epmet-module/oper-crm/oper-crm-server/pom.xml index c058e133cb..f972dcffbf 100644 --- a/epmet-module/oper-crm/oper-crm-server/pom.xml +++ b/epmet-module/oper-crm/oper-crm-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.72 + 0.3.87 com.epmet oper-crm @@ -261,7 +261,7 @@ --> 8090 - test + prod @@ -283,7 +283,7 @@ false - false + true true diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java index 3b31e4feac..a864a031c1 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java @@ -508,48 +508,48 @@ public class CustomerServiceImpl extends BaseServiceImplfalse - false + true true diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml index 8b618d43e3..90296e3d83 100644 --- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-group-server: container_name: resi-group-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.82 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.127 ports: - "8095:8095" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml index 117e26696c..c12490d510 100644 --- a/epmet-module/resi-group/resi-group-server/pom.xml +++ b/epmet-module/resi-group/resi-group-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.82 + 0.3.127 com.epmet resi-group @@ -354,7 +354,7 @@ - false + true true diff --git a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml index aa0679b83f..15488d6f33 100644 --- a/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-guide/resi-guide-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-guide-server: container_name: resi-guide-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.21 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-guide-server:0.3.33 ports: - "8091:8091" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-guide/resi-guide-server/pom.xml b/epmet-module/resi-guide/resi-guide-server/pom.xml index 94b83622e0..0f2ec5ea4f 100644 --- a/epmet-module/resi-guide/resi-guide-server/pom.xml +++ b/epmet-module/resi-guide/resi-guide-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.21 + 0.3.33 com.epmet resi-guide @@ -257,7 +257,7 @@ - false + true true diff --git a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml index c631c116b4..6203abc44d 100644 --- a/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-hall/resi-hall-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-hall-server: container_name: resi-hall-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-hall-server:0.3.34 ports: - "8100:8100" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-hall/resi-hall-server/pom.xml b/epmet-module/resi-hall/resi-hall-server/pom.xml index 299e457a6d..fda6c3856d 100644 --- a/epmet-module/resi-hall/resi-hall-server/pom.xml +++ b/epmet-module/resi-hall/resi-hall-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.24 + 0.3.34 resi-hall com.epmet @@ -202,7 +202,7 @@ false - false + true true diff --git a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml index 50abf2bb7b..9a31b60a8d 100644 --- a/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-home/resi-home-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-home-server: container_name: resi-home-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.16 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-home-server:0.3.23 ports: - "8104:8104" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-home/resi-home-server/pom.xml b/epmet-module/resi-home/resi-home-server/pom.xml index 23a2239cac..d5972d3f1e 100644 --- a/epmet-module/resi-home/resi-home-server/pom.xml +++ b/epmet-module/resi-home/resi-home-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.17 + 0.3.23 resi-home @@ -224,7 +224,7 @@ - false + true diff --git a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml index def0b79e33..09cdf0cd4c 100644 --- a/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-mine-server: container_name: resi-mine-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.45 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-mine-server:0.3.53 ports: - "8094:8094" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-mine/resi-mine-server/pom.xml b/epmet-module/resi-mine/resi-mine-server/pom.xml index 9101e0841f..7fc7613eb4 100644 --- a/epmet-module/resi-mine/resi-mine-server/pom.xml +++ b/epmet-module/resi-mine/resi-mine-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.45 + 0.3.53 com.epmet resi-mine @@ -240,7 +240,7 @@ - false + true diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml index ce9ba1ebaa..d5272f463c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.62 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-partymember-server:0.3.82 ports: - "8096:8096" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index f52ffd6714..43e3789602 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.62 + 0.3.82 com.epmet resi-partymember @@ -266,7 +266,7 @@ - false + true true diff --git a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml index 6962aaca73..ed0013dad4 100644 --- a/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml +++ b/epmet-module/resi-voice/resi-voice-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-voice-server: container_name: resi-voice-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.7 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-voice-server:0.3.12 ports: - "8106:8106" network_mode: host # 使用现有网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-module/resi-voice/resi-voice-server/pom.xml b/epmet-module/resi-voice/resi-voice-server/pom.xml index 0fc30b2de3..a3dd4affa4 100644 --- a/epmet-module/resi-voice/resi-voice-server/pom.xml +++ b/epmet-module/resi-voice/resi-voice-server/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.8 + 0.3.12 resi-voice com.epmet @@ -204,7 +204,7 @@ - false + true diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/deploy/docker-compose-prod.yml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml b/epmet-openapi/epmet-openapi-adv/epmet-openapi-adv-server/pom.xml new file mode 100644 index 0000000000..e69de29bb2 diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml index 69873777e7..02fcb1cecc 100644 --- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml +++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-openapi-scan: container_name: epmet-openapi-scan-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.24 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-openapi-scan:0.3.31 ports: - "8107:8107" network_mode: host # 不会创建新的网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml index 3c3f385f5e..0356318585 100644 --- a/epmet-openapi/epmet-openapi-scan/pom.xml +++ b/epmet-openapi/epmet-openapi-scan/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - 0.3.25 + 0.3.31 epmet-openapi-scan jar @@ -205,7 +205,7 @@ - false + true diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml index 6cbbbfe1c4..b252971a80 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-prod.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-prod - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.138 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/epmet-user-server:0.3.197 ports: - "8087:8087" network_mode: host # 不会创建新的网络 @@ -15,4 +15,4 @@ services: resources: limits: cpus: '0.1' - memory: 600M \ No newline at end of file + memory: 600M diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index e6c7655e35..3bc3afa499 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.138 + 0.3.197 com.epmet epmet-user @@ -349,7 +349,7 @@ - false + true true https://epmet-open.elinkservice.cn/api/epmetscan/api diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index cede578427..201b7467d7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -260,9 +260,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl wechat = userWechatService.selectByUserId(userResiInfoDTO.getUserId()); if(null != wechat && !wechat.isEmpty()){ - baseInfo.setHeadImgUrl(wechat.get(NumConstant.ZERO).getHeadImgUrl()); - baseInfo.setGender(wechat.get(NumConstant.ZERO).getSex().toString()); - baseInfo.setNickname(wechat.get(NumConstant.ZERO).getNickname()); + UserWechatEntity wechatEntity = wechat.get(NumConstant.ZERO); + baseInfo.setHeadImgUrl(wechatEntity.getHeadImgUrl()); + if (wechatEntity.getSex() == null){ + //设置未知 + baseInfo.setGender(NumConstant.ZERO_STR); + }else{ + baseInfo.setGender(String.valueOf(wechatEntity.getSex())); + } + baseInfo.setNickname(wechatEntity.getNickname()); } userBaseInfoService.insertOrUpdate(baseInfo); }