From c90140f3bacd1c3aa48b4dab60ae496ab804ff2a Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 22 Jun 2020 10:15:32 +0800 Subject: [PATCH 01/34] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E6=96=87=E7=AB=A0=E6=A0=87=E7=AD=BE=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-voice/gov-voice-server/deploy/docker-compose-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml index 75870071a0..2289a27ce8 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.55 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.56 ports: - "8105:8105" network_mode: host # 使用现有网络 From 0abd7b8c4c11cdfeef3bce2e7e5379ce1f728461 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Jun 2020 15:53:32 +0800 Subject: [PATCH 02/34] =?UTF-8?q?agencyName=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AFtitle=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-mine/gov-mine-server/deploy/docker-compose-test.yml | 2 +- .../gov-org/gov-org-server/deploy/docker-compose-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml index 6c11640127..09cd9117d5 100644 --- a/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.27 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-mine-server:0.3.29 ports: - "8098:8098" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml index 57f13f3fc7..777d8bafbb 100644 --- a/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.67 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-org-server:0.3.69 ports: - "8092:8092" network_mode: host # 使用现有网络 From 55c742edc6798d01486f50805abd955c3bafd9b7 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 23 Jun 2020 11:12:25 +0800 Subject: [PATCH 03/34] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/StatsGroupServiceImpl.java | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index 15ad3e0b3a..e4447e07ba 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -58,17 +58,19 @@ public class StatsGroupServiceImpl implements StatsGroupService { public void groupGridDaily(Date date) { Integer pageNo = NumConstant.ONE; Integer pageSize = NumConstant.ONE_HUNDRED; - List customerIds = dimCustomerService.selectCustomerIdPage(pageNo,pageSize); - if (customerIds.size() == NumConstant.ZERO){ - return; - } - customerIds.forEach(customerId -> { - DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); - List gridsInfo = dimGridService.getGridListByCustomerId(customerId); - List resultDTOS = groupDataService.groupGridDaily(customerId,dimIdBean,gridsInfo); - factGroupGridDailyService.statisticsGroupGridDaily(resultDTOS,customerId); - }); + List customerIds; + do { + customerIds = dimCustomerService.selectCustomerIdPage(pageNo,pageSize); + if (customerIds.size() != NumConstant.ZERO){ + customerIds.forEach(customerId -> { + DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); + List gridsInfo = dimGridService.getGridListByCustomerId(customerId); + List resultDTOS = groupDataService.groupGridDaily(customerId,dimIdBean,gridsInfo); + factGroupGridDailyService.statisticsGroupGridDaily(resultDTOS,customerId); + }); + } + }while (customerIds.size() != NumConstant.ZERO && customerIds.size() == pageSize); } /** @@ -79,17 +81,18 @@ public class StatsGroupServiceImpl implements StatsGroupService { public void groupAgencyDaily(Date date) { Integer pageNo = NumConstant.ONE; Integer pageSize = NumConstant.ONE_HUNDRED; - List customerIds = dimCustomerService.selectCustomerIdPage(pageNo,pageSize); - if (customerIds.size() == NumConstant.ZERO){ - return; - } - DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); - customerIds.forEach(customerId -> { - - List customerAgencyInfos = dimAgencyService.getAgencyInfoByCustomerId(customerId); - List agencyGroupDaily = this.getAgencyGroupDaily(customerAgencyInfos, dimIdBean, customerId); - factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily,customerId); - }); + List customerIds; + do { + customerIds = dimCustomerService.selectCustomerIdPage(pageNo++,pageSize); + if (customerIds.size() != NumConstant.ZERO){ + DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); + customerIds.forEach(customerId -> { + List customerAgencyInfos = dimAgencyService.getAgencyInfoByCustomerId(customerId); + List agencyGroupDaily = this.getAgencyGroupDaily(customerAgencyInfos, dimIdBean, customerId); + factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily,customerId); + }); + } + }while (customerIds.size() != NumConstant.ZERO && customerIds.size() == pageSize); } /** @@ -258,6 +261,8 @@ public class StatsGroupServiceImpl implements StatsGroupService { /** * @Description 获取时间维度 dateId--weekId--monthId--quarterId--yearId + * 如果有自定义时间，根据自定义时间获取时间维度 + * 没有自定义时间，默认获取前一天的时间维度 * @param * @author zxc */ From 17e13a2d5713d9f39ef6c1f5e8b1ed7e98e18d3a Mon Sep 17 00:00:00 2001 From: jiangyuying Date: Tue, 23 Jun 2020 11:20:24 +0800 Subject: [PATCH 04/34] =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E8=83=BD=E5=8A=9B--?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...actArticlePublishedDepartmentDailyDTO.java | 121 ----------------- .../FactArticlePublishedGridDailyDTO.java | 121 ----------------- .../dto/result/FactPublishedAgencyDTO.java} | 36 +++-- ....java => FactPublishedAgencyDailyDTO.java} | 2 +- .../result/FactPublishedDepartmentDTO.java} | 45 +++++-- .../dto/result/FactPublishedGridDTO.java} | 45 +++++-- .../dto/result/FactTagAgencyDTO.java | 2 +- .../result/FactTagViewedAgencyDailyDTO.java | 126 ------------------ .../result/FactTagViewedAgencyMonthlyDTO.java | 106 --------------- .../FactTagViewedAgencyQuarterlyDTO.java | 106 --------------- .../result/FactTagViewedAgencyYearlyDTO.java | 106 --------------- .../dto/result/FactTagViewedGridDailyDTO.java | 126 ------------------ .../result/FactTagViewedGridMonthlyDTO.java | 106 --------------- .../result/FactTagViewedGridQuarterlyDTO.java | 106 --------------- .../result/FactTagViewedGridYearlyDTO.java | 106 --------------- .../publicity/PublicityController.java | 6 +- .../FactArticlePublishedAgencyDailyDao.java | 42 ------ .../FactArticlePublishedGridDailyDao.java | 33 ----- .../FactTagUsedAgencyMonthlyDao.java | 40 ------ .../FactTagUsedAgencyQuarterlyDao.java | 40 ------ .../publicity/FactTagUsedAgencyYearlyDao.java | 40 ------ .../FactTagViewedAgencyMonthlyDao.java | 40 ------ .../FactTagViewedAgencyQuarterlyDao.java | 40 ------ .../FactTagViewedAgencyYearlyDao.java | 40 ------ .../publicity/FactTagViewedGridDailyDao.java | 33 ----- .../FactTagViewedGridMonthlyDao.java | 33 ----- .../FactTagViewedGridQuarterlyDao.java | 33 ----- .../com/epmet/dao/publicity/PublicityDao.java | 85 ++++++++++++ ...FactArticlePublishedAgencyDailyEntity.java | 91 ------------- ...ArticlePublishedDepartmentDailyEntity.java | 91 ------------- .../FactArticlePublishedGridDailyEntity.java | 91 ------------- .../FactTagViewedAgencyDailyEntity.java | 96 ------------- .../FactTagViewedAgencyMonthlyEntity.java | 76 ----------- .../FactTagViewedAgencyQuarterlyEntity.java | 76 ----------- .../FactTagViewedAgencyYearlyEntity.java | 76 ----------- .../FactTagViewedGridDailyEntity.java | 96 ------------- .../FactTagViewedGridMonthlyEntity.java | 76 ----------- .../FactTagViewedGridQuarterlyEntity.java | 76 ----------- .../FactTagViewedGridYearlyEntity.java | 76 ----------- .../service/publicity/PublicityService.java | 4 +- .../publicity/impl/PublicityServiceImpl.java | 37 ++--- .../FactArticlePublishedAgencyDailyDao.xml | 35 ----- ...FactArticlePublishedDepartmentDailyDao.xml | 27 ---- .../FactArticlePublishedGridDailyDao.xml | 27 ---- .../publicity/FactTagUsedAgencyMonthlyDao.xml | 20 --- .../FactTagUsedAgencyQuarterlyDao.xml | 22 --- .../publicity/FactTagUsedAgencyYearlyDao.xml | 23 ---- .../publicity/FactTagViewedAgencyDailyDao.xml | 28 ---- .../FactTagViewedAgencyMonthlyDao.xml | 20 --- .../FactTagViewedAgencyQuarterlyDao.xml | 22 --- .../FactTagViewedAgencyYearlyDao.xml | 23 ---- .../publicity/FactTagViewedGridDailyDao.xml | 28 ---- .../publicity/FactTagViewedGridMonthlyDao.xml | 24 ---- .../FactTagViewedGridQuarterlyDao.xml | 24 ---- .../publicity/FactTagViewedGridYearlyDao.xml | 24 ---- .../mapper/publicity/PublicityDao.xml | 107 +++++++++++++++ 56 files changed, 315 insertions(+), 2866 deletions(-) delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedGridDailyDTO.java rename epmet-module/data-report/{data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridYearlyDao.java => data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java} (61%) rename epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/{FactArticlePublishedAgencyDailyDTO.java => FactPublishedAgencyDailyDTO.java} (97%) rename epmet-module/data-report/{data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyDailyDao.java => data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java} (57%) rename epmet-module/data-report/{data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedDepartmentDailyDao.java => data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java} (57%) delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDailyDTO.java delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyMonthlyDTO.java delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyQuarterlyDTO.java delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyYearlyDTO.java delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridDailyDTO.java delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridMonthlyDTO.java delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridQuarterlyDTO.java delete mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridYearlyDTO.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedAgencyDailyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedGridDailyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyMonthlyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyQuarterlyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyYearlyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyMonthlyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyQuarterlyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyYearlyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridDailyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridMonthlyDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridQuarterlyDao.java create mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedAgencyDailyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedDepartmentDailyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedGridDailyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyDailyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyMonthlyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyQuarterlyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyYearlyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridDailyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridMonthlyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridQuarterlyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridYearlyEntity.java delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedAgencyDailyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedDepartmentDailyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedGridDailyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyMonthlyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyQuarterlyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyYearlyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyDailyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyMonthlyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyQuarterlyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyYearlyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridDailyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridMonthlyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridQuarterlyDao.xml delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridYearlyDao.xml create mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java deleted file mode 100644 index 63dcdf8194..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章发布数量【部门】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactArticlePublishedDepartmentDailyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 发布文章单位所属机关ID 发布文章单位所属机关ID - */ - private String agencyId; - - /** - * 部门ID - */ - private String departmentId; - - /** - * 文章累计发文数量 文章数量 - */ - private Integer articleTotalCount; - - /** - * 当前发文数量 当前未下线的文章数量 - */ - private Integer articlePublishedCount; - - /** - * 日期ID 日期ID - */ - private String dateId; - - /** - * 周ID 周ID eg：2020W01 = 2020年第一周 - */ - private String weekId; - - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedGridDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedGridDailyDTO.java deleted file mode 100644 index ef9441018c..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedGridDailyDTO.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章发布数量【网格】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactArticlePublishedGridDailyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 发布单位所属机关ID 发布单位所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 文章累计发文数量 文章数量 - */ - private Integer articleTotalCount; - - /** - * 当前发文数量 当前未下线的文章数量 - */ - private Integer articlePublishedCount; - - /** - * 日期ID 日期ID - */ - private String dateId; - - /** - * 周ID 周ID eg：2020W01 = 2020年第一周 - */ - private String weekId; - - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridYearlyDao.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java similarity index 61% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridYearlyDao.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java index 39abffa211..6d1144a2c8 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridYearlyDao.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java @@ -15,19 +15,39 @@ * along with this program. If not, see . */ -package com.epmet.dao.publicity; +package com.epmet.publicity.dto.result; + +import lombok.Data; + +import java.io.Serializable; -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.publicity.FactTagViewedGridYearlyEntity; -import org.apache.ibatis.annotations.Mapper; /** - * 文章引用标签阅读数量【网格】年度统计表 + * 文章发表数量—下级机关统计 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-06-19 */ -@Mapper -public interface FactTagViewedGridYearlyDao extends BaseDao { - +@Data +public class FactPublishedAgencyDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 累计发文总数 + */ + private Integer publishedTotal; + + /** + * 发布中的文章总数 + */ + private Integer publishingTotal; + + /** + * 数据截止日期 + */ + private String dateName; + + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedAgencyDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java similarity index 97% rename from epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedAgencyDailyDTO.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java index 8aa0274eab..50f07bcb8f 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedAgencyDailyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java @@ -29,7 +29,7 @@ import lombok.Data; * @since v1.0.0 2020-06-19 */ @Data -public class FactArticlePublishedAgencyDailyDTO implements Serializable { +public class FactPublishedAgencyDailyDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyDailyDao.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java similarity index 57% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyDailyDao.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java index f07422bba4..bc26c9fb50 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyDailyDao.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java @@ -15,19 +15,48 @@ * along with this program. If not, see . */ -package com.epmet.dao.publicity; +package com.epmet.publicity.dto.result; + +import lombok.Data; + +import java.io.Serializable; -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.publicity.FactTagViewedAgencyDailyEntity; -import org.apache.ibatis.annotations.Mapper; /** - * 文章引用标签阅读数量【机关】日统计表 + * 文章发表数量—直属部门统计 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-06-19 */ -@Mapper -public interface FactTagViewedAgencyDailyDao extends BaseDao { - +@Data +public class FactPublishedDepartmentDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 机关名称 + */ + private String name; + + /** + * 发文数量 + */ + private Integer value; + + /** + * 固定值：文章数量 + */ + private String type="文章数量"; + + /** + * 机关Id + */ + private String agencyId; + + /** + * 部门Id + */ + private String departmentId; + + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedDepartmentDailyDao.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java similarity index 57% rename from epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedDepartmentDailyDao.java rename to epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java index c4c74294b6..ad8a3e6c9e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedDepartmentDailyDao.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java @@ -15,19 +15,48 @@ * along with this program. If not, see . */ -package com.epmet.dao.publicity; +package com.epmet.publicity.dto.result; + +import lombok.Data; + +import java.io.Serializable; -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.publicity.FactArticlePublishedDepartmentDailyEntity; -import org.apache.ibatis.annotations.Mapper; /** - * 文章发布数量【部门】日统计表 + * 文章发表数量—直属部门统计 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-06-19 */ -@Mapper -public interface FactArticlePublishedDepartmentDailyDao extends BaseDao { - +@Data +public class FactPublishedGridDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 机关名称 + */ + private String name; + + /** + * 发文数量 + */ + private Integer value; + + /** + * 固定值：文章数量 + */ + private String type="文章数量"; + + /** + * 机关Id + */ + private String agencyId; + + /** + * 网格Id + */ + private String gridId; + + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java index 766a95393a..1d91a3287a 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagAgencyDTO.java @@ -24,7 +24,7 @@ import java.util.Date; /** - * 文章引用标签阅读数量【机关】日统计表 + * 文章引用标签阅读数量【机关】统计表 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-06-19 diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDailyDTO.java deleted file mode 100644 index f9bb58d4ed..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDailyDTO.java +++ /dev/null @@ -1,126 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章引用标签阅读数量【机关】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactTagViewedAgencyDailyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 日期ID 天数ID eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日 - */ - private String dateId; - - /** - * 周ID 周ID eg：2020W01 = 2020年第一周 - */ - private String weekId; - - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyMonthlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyMonthlyDTO.java deleted file mode 100644 index 9e66642afb..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyMonthlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章引用标签阅读数量【机关】月统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactTagViewedAgencyMonthlyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 月份ID 月份ID eg：2020-06 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyQuarterlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyQuarterlyDTO.java deleted file mode 100644 index b5e845f6f8..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyQuarterlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章引用标签阅读数量【机关】季度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactTagViewedAgencyQuarterlyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyYearlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyYearlyDTO.java deleted file mode 100644 index 9f420f6b37..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyYearlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章引用标签阅读数量【机关】年度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactTagViewedAgencyYearlyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridDailyDTO.java deleted file mode 100644 index d34da43745..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridDailyDTO.java +++ /dev/null @@ -1,126 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章引用标签阅读数量【网格】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactTagViewedGridDailyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 文章发布所属机关ID 文章发布所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 日期ID 天数ID eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日 - */ - private String dateId; - - /** - * 周ID 周ID eg：2020W01 = 2020年第一周 - */ - private String weekId; - - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridMonthlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridMonthlyDTO.java deleted file mode 100644 index a1c6e3209d..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridMonthlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章引用标签阅读数量【网格】月统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactTagViewedGridMonthlyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 文章发布所属机关ID 文章发布所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 月份ID 月份ID eg：2020-06 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridQuarterlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridQuarterlyDTO.java deleted file mode 100644 index 10b049d10f..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridQuarterlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章引用标签阅读数量【网格】季度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactTagViewedGridQuarterlyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 文章发布所属机关ID 文章发布所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridYearlyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridYearlyDTO.java deleted file mode 100644 index 2864b508de..0000000000 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridYearlyDTO.java +++ /dev/null @@ -1,106 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.publicity.dto.result; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - - -/** - * 文章引用标签阅读数量【网格】年度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -public class FactTagViewedGridYearlyDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 文章发布所属机关ID 文章发布所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java index 2d79a95762..9f64bec3e4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java @@ -23,7 +23,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.publicity.dto.form.TagFormDTO; -import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO; +import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO; import com.epmet.publicity.dto.result.FactTagAgencyDTO; import com.epmet.service.publicity.PublicityService; import org.springframework.beans.factory.annotation.Autowired; @@ -53,8 +53,8 @@ public class PublicityController { * @Description 宣传能力—工作端—当前机关累计发文和当前发文 **/ @PostMapping("summaryinfo") - public Result summaryInfo(@LoginUser TokenDto tokenDto) { - return new Result().ok(publicityService.summaryInfo(tokenDto)); + public Result summaryInfo(@LoginUser TokenDto tokenDto) { + return new Result().ok(publicityService.summaryInfo(tokenDto)); } /** diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedAgencyDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedAgencyDailyDao.java deleted file mode 100644 index 6f1c09e7db..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedAgencyDailyDao.java +++ /dev/null @@ -1,42 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.publicity.FactArticlePublishedAgencyDailyEntity; -import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -/** - * 文章发布数量【机关】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactArticlePublishedAgencyDailyDao extends BaseDao { - - /** - * @Description 宣传能力—工作端—当前机关累计发文和当前发文 - * @param agencyId - * @author jyy - */ - FactArticlePublishedAgencyDailyDTO summaryInfo(@Param("agencyId") String agencyId); - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedGridDailyDao.java deleted file mode 100644 index 7b4277b25e..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactArticlePublishedGridDailyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.publicity.FactArticlePublishedGridDailyEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 文章发布数量【网格】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactArticlePublishedGridDailyDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyMonthlyDao.java deleted file mode 100644 index c7e6d8dd9b..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyMonthlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.publicity.dto.result.FactTagAgencyDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 文章引用标签阅读数量【机关】月统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactTagUsedAgencyMonthlyDao { - /** - * @param agencyId monthId - * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个 - * @author zxc - */ - List getMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyQuarterlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyQuarterlyDao.java deleted file mode 100644 index 62655117ab..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyQuarterlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.publicity.dto.result.FactTagAgencyDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 文章引用标签阅读数量【机关】季度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactTagUsedAgencyQuarterlyDao { - /** - * @param agencyId monthId - * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个 - * @author zxc - */ - List getQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyYearlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyYearlyDao.java deleted file mode 100644 index da999eb748..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagUsedAgencyYearlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.publicity.dto.result.FactTagAgencyDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 文章引用标签阅读数量【机关】年度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactTagUsedAgencyYearlyDao { - /** - * @param agencyId monthId - * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个 - * @author zxc - */ - List getYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyMonthlyDao.java deleted file mode 100644 index 4b9f72873a..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyMonthlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.publicity.dto.result.FactTagAgencyDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 文章引用标签阅读数量【机关】月统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactTagViewedAgencyMonthlyDao { - /** - * @param agencyId monthId - * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个 - * @author zxc - */ - List getMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyQuarterlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyQuarterlyDao.java deleted file mode 100644 index 5ba0a377ed..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyQuarterlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.publicity.dto.result.FactTagAgencyDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 文章引用标签阅读数量【机关】季度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactTagViewedAgencyQuarterlyDao { - /** - * @param agencyId monthId - * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个 - * @author zxc - */ - List getQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyYearlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyYearlyDao.java deleted file mode 100644 index db124cb121..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedAgencyYearlyDao.java +++ /dev/null @@ -1,40 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.publicity.dto.result.FactTagAgencyDTO; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * 文章引用标签阅读数量【机关】年度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactTagViewedAgencyYearlyDao { - /** - * @param agencyId monthId - * @Description 根据标签分组，获取当月每个标签数量，按照数量降序，取前pagesize个 - * @author zxc - */ - List getYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize); -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridDailyDao.java deleted file mode 100644 index 524f2dafe0..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridDailyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.publicity.FactTagViewedGridDailyEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 文章引用标签阅读数量【网格】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactTagViewedGridDailyDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridMonthlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridMonthlyDao.java deleted file mode 100644 index e616dbd156..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridMonthlyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.publicity.FactTagViewedGridMonthlyEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 文章引用标签阅读数量【网格】月统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactTagViewedGridMonthlyDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridQuarterlyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridQuarterlyDao.java deleted file mode 100644 index a83964bb1e..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/FactTagViewedGridQuarterlyDao.java +++ /dev/null @@ -1,33 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.dao.publicity; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.publicity.FactTagViewedGridQuarterlyEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * 文章引用标签阅读数量【网格】季度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Mapper -public interface FactTagViewedGridQuarterlyDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java new file mode 100644 index 0000000000..aa2475e2c5 --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java @@ -0,0 +1,85 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao.publicity; + +import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO; +import com.epmet.publicity.dto.result.FactTagAgencyDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 文章发布数量【机关】日统计表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-06-19 + */ +@Mapper +public interface PublicityDao { + + /** + * @Description 宣传能力—工作端—当前机关累计发文和当前发文 + * @param agencyId 机关id + * @author jyy + */ + FactPublishedAgencyDailyDTO summaryInfo(@Param("agencyId") String agencyId); + + /** + * @Description 当月———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个 + * @param agencyId,monthId,pageSize 机关id，月，展示数量 + * @author zxc + */ + List getViewedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当季———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个 + * @param agencyId,quarterId,pageSize 机关id，季，展示数量 + * @author zxc + */ + List getViewedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当年———获取机关下，获取每个标签阅读数量，按照数量降序，取前pagesize个 + * @param agencyId,yearId,pageSize 机关id，年，展示数量 + * @author zxc + */ + List getViewedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当月———获取机关下，获取每个标签发文数量，按照数量降序，取前pagesize个 + * @param agencyId,monthId,pageSize 机关id，月，展示数量 + * @author zxc + */ + List getUsedMonthlyCountByTag(@Param("agencyId") String agencyId, @Param("monthId") String monthId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当季———获取机关下，获取每个标签发文数量，按照数量降序，取前pagesize个 + * @param agencyId,quarterId,pageSize 机关id，季，展示数量 + * @author zxc + */ + List getUsedQuarterlyCountByTag(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当年———获取机关下，每个标签发文数量，按照数量降序，取前pagesize个 + * @param agencyId,yearId,pageSize 机关id，年，展示数量 + * @author zxc + */ + List getUsedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize); + +} \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedAgencyDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedAgencyDailyEntity.java deleted file mode 100644 index 673699742d..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedAgencyDailyEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章发布数量【机关】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_article_published_agency_daily") -public class FactArticlePublishedAgencyDailyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 文章累计发文数量 文章数量 - */ - private Integer articleTotalCount; - - /** - * 当前发文数量 当前未下线的文章数量 - */ - private Integer articlePublishedCount; - - /** - * 日期ID 日期ID - */ - private String dateId; - - /** - * 周ID 周ID eg：2020W01 = 2020年第一周 - */ - private String weekId; - - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedDepartmentDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedDepartmentDailyEntity.java deleted file mode 100644 index 2a67346010..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedDepartmentDailyEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章发布数量【部门】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_article_published_department_daily") -public class FactArticlePublishedDepartmentDailyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 发布文章单位所属机关ID 发布文章单位所属机关ID - */ - private String agencyId; - - /** - * 部门ID - */ - private String departmentId; - - /** - * 文章累计发文数量 文章数量 - */ - private Integer articleTotalCount; - - /** - * 当前发文数量 当前未下线的文章数量 - */ - private Integer articlePublishedCount; - - /** - * 日期ID 日期ID - */ - private String dateId; - - /** - * 周ID 周ID eg：2020W01 = 2020年第一周 - */ - private String weekId; - - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedGridDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedGridDailyEntity.java deleted file mode 100644 index 743724c2ab..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactArticlePublishedGridDailyEntity.java +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章发布数量【网格】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_article_published_grid_daily") -public class FactArticlePublishedGridDailyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 发布单位所属机关ID 发布单位所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 文章累计发文数量 文章数量 - */ - private Integer articleTotalCount; - - /** - * 当前发文数量 当前未下线的文章数量 - */ - private Integer articlePublishedCount; - - /** - * 日期ID 日期ID - */ - private String dateId; - - /** - * 周ID 周ID eg：2020W01 = 2020年第一周 - */ - private String weekId; - - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyDailyEntity.java deleted file mode 100644 index fb3d59a1ca..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyDailyEntity.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章引用标签阅读数量【机关】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_tag_viewed_agency_daily") -public class FactTagViewedAgencyDailyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 日期ID 天数ID eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日 - */ - private String dateId; - - /** - * 周ID 周ID eg：2020W01 = 2020年第一周 - */ - private String weekId; - - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyMonthlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyMonthlyEntity.java deleted file mode 100644 index 35cac8e93f..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyMonthlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章引用标签阅读数量【机关】月统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_tag_viewed_agency_monthly") -public class FactTagViewedAgencyMonthlyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 月份ID 月份ID eg：2020-06 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyQuarterlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyQuarterlyEntity.java deleted file mode 100644 index 318cfc19f4..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyQuarterlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章引用标签阅读数量【机关】季度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_tag_viewed_agency_quarterly") -public class FactTagViewedAgencyQuarterlyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyYearlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyYearlyEntity.java deleted file mode 100644 index 5680665c68..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedAgencyYearlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章引用标签阅读数量【机关】年度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_tag_viewed_agency_yearly") -public class FactTagViewedAgencyYearlyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridDailyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridDailyEntity.java deleted file mode 100644 index 878f9d3428..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridDailyEntity.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章引用标签阅读数量【网格】日统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_tag_viewed_grid_daily") -public class FactTagViewedGridDailyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 文章发布所属机关ID 文章发布所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 日期ID 天数ID eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日 - */ - private String dateId; - - /** - * 周ID 周ID eg：2020W01 = 2020年第一周 - */ - private String weekId; - - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridMonthlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridMonthlyEntity.java deleted file mode 100644 index eeae33a44a..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridMonthlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章引用标签阅读数量【网格】月统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_tag_viewed_grid_monthly") -public class FactTagViewedGridMonthlyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 文章发布所属机关ID 文章发布所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 月份ID 月份ID eg：2020-06 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridQuarterlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridQuarterlyEntity.java deleted file mode 100644 index 75243cc1cc..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridQuarterlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章引用标签阅读数量【网格】季度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_tag_viewed_grid_quarterly") -public class FactTagViewedGridQuarterlyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 文章发布所属机关ID 文章发布所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridYearlyEntity.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridYearlyEntity.java deleted file mode 100644 index 9842520a5b..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/entity/publicity/FactTagViewedGridYearlyEntity.java +++ /dev/null @@ -1,76 +0,0 @@ -/** - * Copyright 2018 人人开源 https://www.renren.io - *

- * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - *

- * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - *

- * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package com.epmet.entity.publicity; - -import com.baomidou.mybatisplus.annotation.TableName; - -import com.epmet.commons.mybatis.entity.BaseEpmetEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.Date; - -/** - * 文章引用标签阅读数量【网格】年度统计表 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2020-06-19 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("fact_tag_viewed_grid_yearly") -public class FactTagViewedGridYearlyEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 文章发布所属机关ID 文章发布所属机关ID - */ - private String agencyId; - - /** - * 网格ID - */ - private String gridId; - - /** - * 标签ID 标签ID - */ - private String tagId; - - /** - * 标签名称 标签名称 - */ - private String tagName; - - /** - * 文章引用标签阅读数 文章引用标签阅读数 - */ - private Integer tagReadCount; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - -} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java index 5d3ee0c762..e79ed8c1d5 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java @@ -18,7 +18,7 @@ package com.epmet.service.publicity; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO; +import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO; import com.epmet.publicity.dto.result.FactTagAgencyDTO; import java.util.List; @@ -36,7 +36,7 @@ public interface PublicityService { * @param tokenDto * @author jyy */ - FactArticlePublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto); + FactPublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto); /** * @Description 宣传能力—工作端—宣传能力-获取阅读最多的分类数据 diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java index fecabf3eaf..e65b569d23 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java @@ -19,15 +19,13 @@ package com.epmet.service.publicity.impl; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.dao.publicity.FactArticlePublishedAgencyDailyDao; -import com.epmet.dao.publicity.FactTagViewedAgencyMonthlyDao; -import com.epmet.dao.publicity.FactTagViewedAgencyQuarterlyDao; -import com.epmet.dao.publicity.FactTagViewedAgencyYearlyDao; import com.epmet.dto.form.LoginUserDetailsFormDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.publicity.dto.result.FactArticlePublishedAgencyDailyDTO; + +import com.epmet.dao.publicity.PublicityDao; +import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO; import com.epmet.publicity.dto.result.FactTagAgencyDTO; import com.epmet.service.publicity.PublicityService; @@ -36,7 +34,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.Date; import java.util.List; @@ -48,15 +45,8 @@ import java.util.List; */ @Service public class PublicityServiceImpl implements PublicityService { - - @Autowired - private FactArticlePublishedAgencyDailyDao factArticlePublishedAgencyDailyDao;//机关每日发文 - @Autowired - private FactTagViewedAgencyMonthlyDao factTagViewedAgencyMonthlyDao;//机关-每月-阅读 - @Autowired - private FactTagViewedAgencyQuarterlyDao factTagViewedAgencyQuarterlyDao;//机关-每季度-阅读 @Autowired - private FactTagViewedAgencyYearlyDao factTagViewedAgencyYearlyDao;//机关-每年-阅读 + private PublicityDao publicityDao;//机关每日发文 @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @@ -66,9 +56,10 @@ public class PublicityServiceImpl implements PublicityService { * @author jyy */ @Override - public FactArticlePublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto) { + public FactPublishedAgencyDailyDTO summaryInfo(TokenDto tokenDto) { String agencyId = this.getLoginUserDetails(tokenDto); - return factArticlePublishedAgencyDailyDao.summaryInfo(agencyId); + agencyId="b9e295f8c1906a0d1c5e0b313afcda3f"; + return publicityDao.summaryInfo(agencyId); } @@ -87,15 +78,15 @@ public class PublicityServiceImpl implements PublicityService { if (StringUtils.equals("month", type)) {//当月 String monthId = strDate.substring(0, 4) + strDate.substring(5, 7); - return factTagViewedAgencyMonthlyDao.getMonthlyCountByTag(agencyId, monthId, pageSize); + return publicityDao.getViewedMonthlyCountByTag(agencyId, monthId, pageSize); } else if (StringUtils.equals("quarter", type)) {//当季 String quarterId = strDate + "Q" + DateUtils.getQuarterIndex(date); - return factTagViewedAgencyQuarterlyDao.getQuarterlyCountByTag(agencyId, quarterId, pageSize); + return publicityDao.getViewedQuarterlyCountByTag(agencyId, quarterId, pageSize); } else if (StringUtils.equals("year", type)) {//当年 - return factTagViewedAgencyYearlyDao.getYearlyCountByTag(agencyId, yearId, pageSize); + return publicityDao.getViewedYearlyCountByTag(agencyId, yearId, pageSize); } else { return null; @@ -105,7 +96,7 @@ public class PublicityServiceImpl implements PublicityService { } /** - * @param tokenDto,pageSize,type + * @param tokenDto pageSize type * @Description 宣传能力—工作端—宣传能力-获取发表最多的分类数据 * @author jyy */ @@ -119,15 +110,15 @@ public class PublicityServiceImpl implements PublicityService { if (StringUtils.equals("month", type)) {//当月 String monthId = strDate.substring(0, 4) + strDate.substring(5, 7); - return factTagViewedAgencyMonthlyDao.getMonthlyCountByTag(agencyId, monthId, pageSize); + return publicityDao.getUsedMonthlyCountByTag(agencyId, monthId, pageSize); } else if (StringUtils.equals("quarter", type)) {//当季 String quarterId = strDate + "Q" + DateUtils.getQuarterIndex(date); - return factTagViewedAgencyQuarterlyDao.getQuarterlyCountByTag(agencyId, quarterId, pageSize); + return publicityDao.getUsedQuarterlyCountByTag(agencyId, quarterId, pageSize); } else if (StringUtils.equals("year", type)) {//当年 - return factTagViewedAgencyYearlyDao.getYearlyCountByTag(agencyId, yearId, pageSize); + return publicityDao.getUsedYearlyCountByTag(agencyId, yearId, pageSize); } else { return null; diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedAgencyDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedAgencyDailyDao.xml deleted file mode 100644 index c7897f6aec..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedAgencyDailyDao.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedDepartmentDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedDepartmentDailyDao.xml deleted file mode 100644 index 9ea91a5f1a..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedDepartmentDailyDao.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedGridDailyDao.xml deleted file mode 100644 index a38deee2c2..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactArticlePublishedGridDailyDao.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyMonthlyDao.xml deleted file mode 100644 index f4806e8e40..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyMonthlyDao.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyQuarterlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyQuarterlyDao.xml deleted file mode 100644 index 9c10faf1b1..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyQuarterlyDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyYearlyDao.xml deleted file mode 100644 index 3384db1368..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagUsedAgencyYearlyDao.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyDailyDao.xml deleted file mode 100644 index 9800e7e6d8..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyDailyDao.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyMonthlyDao.xml deleted file mode 100644 index 937da74e63..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyMonthlyDao.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyQuarterlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyQuarterlyDao.xml deleted file mode 100644 index 5ff395280d..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyQuarterlyDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyYearlyDao.xml deleted file mode 100644 index e0b274080d..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedAgencyYearlyDao.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridDailyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridDailyDao.xml deleted file mode 100644 index 0c7fa42162..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridDailyDao.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridMonthlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridMonthlyDao.xml deleted file mode 100644 index dab09fcbc0..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridMonthlyDao.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridQuarterlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridQuarterlyDao.xml deleted file mode 100644 index e54d037353..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridQuarterlyDao.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridYearlyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridYearlyDao.xml deleted file mode 100644 index 347c54204a..0000000000 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/FactTagViewedGridYearlyDao.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml new file mode 100644 index 0000000000..73ec0850fb --- /dev/null +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml @@ -0,0 +1,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From aea9c2b6f824b79e0ffe8ed475f6218eed3b264c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 23 Jun 2020 11:21:01 +0800 Subject: [PATCH 05/34] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/issue/IssueDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml index b9b83d0f2f..19e81a0cb5 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml @@ -33,7 +33,7 @@ INNER JOIN dim_agency da ON fiad.AGENCY_ID = da.ID WHERE fiad.DEL_FLAG = '0' - AND PID = #{agencyId} + AND fiad.PID = #{agencyId} GROUP BY AGENCY_ID @@ -60,7 +60,7 @@ VOTING_INCR, SHIFT_PROJECT_INCR, CLOSED_INCR, - DATE_FORMAT(DATE_ID, '%Y/%m/%d') + DATE_FORMAT(DATE_ID, '%Y/%m/%d') AS DATE_NAME FROM fact_issue_agency_daily fiad WHERE DEL_FLAG = '0' @@ -76,7 +76,7 @@ VOTING_INCR, SHIFT_PROJECT_INCR, CLOSED_INCR, - DATE_FORMAT(STR_TO_DATE(MONTH_ID,'%Y%m'), '%Y/%m') AS MONTH_ID + DATE_FORMAT(STR_TO_DATE(MONTH_ID,'%Y%m'), '%Y/%m') AS DATE_NAME FROM fact_issue_agency_monthly fiam WHERE DEL_FLAG = '0' From 3d806673d4740d3278a482d74ddc7bb7c8bc5a6d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 11:49:11 +0800 Subject: [PATCH 06/34] =?UTF-8?q?=E7=BB=84=E7=BB=87=E8=83=BD=E5=8A=9B-?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=94=A8=E6=88=B7=E5=A2=9E=E9=87=8F=E6=8A=98?= =?UTF-8?q?=E7=BA=BF=E5=9B=BE=E5=88=9D=E5=A7=8B=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/DateUtils.java | 109 +++++++++++++-- .../epmet/constant/UserAnalysisConstant.java | 3 + .../dto/result/user/UserIncrTrendResDTO.java | 20 +++ .../result/user/UserIncrTrendResultDTO.java | 6 +- .../com/epmet/dao/user/UserAnalysisDao.java | 37 +++++ .../user/impl/UserAnalysisServiceImpl.java | 129 +++++++++++++++++- .../resources/mapper/user/UserAnalysisDao.xml | 70 ++++++++++ 7 files changed, 363 insertions(+), 11 deletions(-) create mode 100644 epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 482ddd52b3..532420581a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -16,10 +16,7 @@ import org.joda.time.format.DateTimeFormatter; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Date; -import java.util.List; +import java.util.*; /** * 日期处理工具类 @@ -49,7 +46,7 @@ public class DateUtils { public static final String MONTH_NAME_PATTERN = "yyyy年MM月"; public static final String DATE_PATTERN_YYYY = "yyyy"; public static final String DATE_PATTERN_YYYYMM = "yyyyMM"; - + public static final String DATE_PATTERN_YYYY_MM = "yyyy-MM"; public static final String WEEK_TYPE_ENGLISH = "english"; public static final String WEEK_TYPE_CHINESE = "chinese"; @@ -367,15 +364,111 @@ public class DateUtils { /** * @return java.lang.String - * @param dateStr yyyyMMdd + * @param dateStr yyyyMMdd返回yyyy.MM.dd yyyyMM返回yyyy/MM * @author yinzuomei * @description 返回yyyy.MM.dd * @Date 2020/6/22 18:38 **/ - public static String getDatePointPattern(String dateStr){ + public static String getxAxisDatePattern(String dateStr,String character){ if(StringUtils.isNotBlank(dateStr)&&dateStr.length()==8){ - return String.valueOf(new StringBuffer(dateStr).insert(4,".").insert(7,".")); + return String.valueOf(new StringBuffer(dateStr).insert(4,character).insert(7,character)); + }else if(StringUtils.isNotBlank(dateStr)&&dateStr.length()==6){ + return String.valueOf(new StringBuffer(dateStr).insert(4,character)); } return dateStr; } + + /** + * @return java.lang.String + * @param beforDay + * @author yinzuomei + * @description 获取当前日期的前n天 返回yyyyMMdd + * @Date 2020/6/23 1:50 + **/ + public static String getBeforeNDay(int beforDay){ + Calendar c = Calendar.getInstance(); + c.add(Calendar.DATE, - beforDay); + Date date = c.getTime(); + return DateUtils.format(date,DateUtils.DATE_PATTERN_YYYYMMDD); + } + + /** + * @return java.lang.String + * @param beforMonth + * @author yinzuomei + * @description 获取当前 月份的前n月 返回yyyyMM + * @Date 2020/6/23 1:50 + **/ + public static String getBeforeNMonth(int beforMonth){ + Calendar c = Calendar.getInstance(); + c.add(Calendar.MONTH, - beforMonth); + Date date = c.getTime(); + return DateUtils.format(date,DateUtils.DATE_PATTERN_YYYYMM); + } + + /** + * @return java.util.List 返回yyyyMMdd + * @param startTime yyyyMMdd + * @param endTime yyyyMMdd + * @author yinzuomei + * @description 获取两个日期之间所有的日期集合，包含开始结束 + * @Date 2020/6/23 1:26 + **/ + public static List getDaysBetween(String startTime, String endTime){ + // 返回的日期集合 + List days = new ArrayList(); + try{ + Date start = DateUtils.parse(startTime,DateUtils.DATE_PATTERN_YYYYMMDD); + Date end = DateUtils.parse(endTime,DateUtils.DATE_PATTERN_YYYYMMDD); + + Calendar tempStart = Calendar.getInstance(); + tempStart.setTime(start); + + Calendar tempEnd = Calendar.getInstance(); + tempEnd.setTime(end); + // 日期加1(包含结束) + tempEnd.add(Calendar.DATE, +1); + while (tempStart.before(tempEnd)) { + days.add(DateUtils.format(tempStart.getTime(),DateUtils.DATE_PATTERN_YYYYMMDD)); + tempStart.add(Calendar.DAY_OF_YEAR, 1); + } + }catch (Exception e){ + e.printStackTrace(); + } + return days; + } + + /** + * @return java.util.List + * @param minDate yyyMM + * @param maxDate yyyyMM + * @author yinzuomei + * @description 计算两个月份中间所有的月份包含起始 + * @Date 2020/6/23 2:10 + **/ + public static List getMonthBetween(String minDate, String maxDate){ + ArrayList result = new ArrayList(); + try{ + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM");//格式化为年月 + + Calendar min = Calendar.getInstance(); + Calendar max = Calendar.getInstance(); + + min.setTime(sdf.parse(minDate)); + min.set(min.get(Calendar.YEAR), min.get(Calendar.MONTH), 1); + + max.setTime(sdf.parse(maxDate)); + max.set(max.get(Calendar.YEAR), max.get(Calendar.MONTH), 2); + + Calendar curr = min; + while (curr.before(max)) { + result.add(sdf.format(curr.getTime())); + curr.add(Calendar.MONTH, 1); + } + min = null;max = null;curr = null; + }catch(Exception e){ + e.printStackTrace(); + } + return result; + } } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/UserAnalysisConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/UserAnalysisConstant.java index ffd096b2bd..f42d52fb72 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/UserAnalysisConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/constant/UserAnalysisConstant.java @@ -34,4 +34,7 @@ public interface UserAnalysisConstant { * 党员 */ String PARTYMEMBER="党员"; + + String DAY_TYPE="day"; + String MONTH_TYPE="month"; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResDTO.java new file mode 100644 index 0000000000..a7f4e87dc5 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result.user; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/23 9:13 + */ +@Data +public class UserIncrTrendResDTO implements Serializable { + private static final long serialVersionUID = 290620373673325352L; + private Integer regIncr; + private Integer warmIncr; + private Integer partymemberIncr; + private String dateIdOrMonthId; +} diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResultDTO.java index d36d7aba03..bfd9b17535 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/user/UserIncrTrendResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result.user; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -13,7 +14,7 @@ import java.io.Serializable; @Data public class UserIncrTrendResultDTO implements Serializable { /** - * 日期如果按日查询返回yyyy-MM-dd,如果按月返回yyyy-MM + * 日期如果按日查询返回yyyy/MM/dd,如果按月返回yyyy/MM */ private String date; @@ -27,4 +28,7 @@ public class UserIncrTrendResultDTO implements Serializable { */ private Integer value; + // yyyyMMdd yyyyMM + @JsonIgnore + private String dateOrMonthId; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java index 2fd8c6b3c8..feba486e41 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/user/UserAnalysisDao.java @@ -3,6 +3,7 @@ package com.epmet.dao.user; import com.epmet.dto.DimAgencyDTO; import com.epmet.dto.DimGridDTO; +import com.epmet.dto.result.user.UserIncrTrendResDTO; import com.epmet.dto.result.user.UserSubAgencyResDTO; import com.epmet.dto.result.user.UserSubGridResDTO; import com.epmet.dto.result.user.UserSummaryInfoResultDTO; @@ -95,4 +96,40 @@ public interface UserAnalysisDao { * @Date 2020/6/23 0:18 **/ List selectRegSubGridRes(@Param("dateId")String dateId, @Param("agencyId") String agencyId); + + /** + * @return java.util.List + * @param myAgencyId + * @author yinzuomei + * @description + * @Date 2020/6/23 11:24 + **/ + List selectRegDayIncr(@Param("agencyId")String myAgencyId); + + /** + * @return java.util.List + * @param myAgencyId + * @author yinzuomei + * @description + * @Date 2020/6/23 11:24 + **/ + List selectRegMonthIncr(@Param("agencyId")String myAgencyId); + + /** + * @return java.util.List + * @param myAgencyId + * @author yinzuomei + * @description + * @Date 2020/6/23 11:24 + **/ + List selectParticipationUserDayIncr(@Param("agencyId")String myAgencyId); + + /** + * @return java.util.List + * @param myAgencyId + * @author yinzuomei + * @description + * @Date 2020/6/23 11:24 + **/ + List selectParticipationUserMonthIncr(@Param("agencyId") String myAgencyId); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java index dbc4d20f2e..655b6febae 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java @@ -89,7 +89,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { userSummaryInfoResultDTO=userAnalysisDao.selectRegUserSummaryInfo(myAgencyId); } if(null!=userSummaryInfoResultDTO){ - userSummaryInfoResultDTO.setCurrentDate(DateUtils.getDatePointPattern(userSummaryInfoResultDTO.getCurrentDate())); + userSummaryInfoResultDTO.setCurrentDate(DateUtils.getxAxisDatePattern(userSummaryInfoResultDTO.getCurrentDate(),".")); //提取出工具类 userSummaryInfoResultDTO.setPartymemberProportion(userSummaryInfoResultDTO.getPartymemberProportionValue().stripTrailingZeros().toPlainString()); userSummaryInfoResultDTO.setWarmHeartedProportion(userSummaryInfoResultDTO.getWarmHeartedProportionValue().stripTrailingZeros().toPlainString()); @@ -295,6 +295,131 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { **/ @Override public List incrTrend(UserIncrTrendFormDTO formDTO) { - return null; + //获取用户所属机关id + String myAgencyId = this.getMyAgency(); + List dimList = this.initUserIncrTrendResultDTO(formDTO.getType()); + if(CollectionUtils.isEmpty(dimList)){ + logger.error("横坐标初始失败"); + return new ArrayList<>(); + } + List list=new ArrayList<>(); + if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) { + //注册用户数、日 + list=userAnalysisDao.selectRegDayIncr(myAgencyId); + } else if (UserAnalysisConstant.REG_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) { + //注册用户数、月 + list=userAnalysisDao.selectRegMonthIncr(myAgencyId); + } else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.DAY_TYPE.equals(formDTO.getType())) { + //参与用户数、日 + list=userAnalysisDao.selectParticipationUserDayIncr(myAgencyId); + } else if (UserAnalysisConstant.PARTI_FLAG.equals(formDTO.getRegOrPartiFlag()) && UserAnalysisConstant.MONTH_TYPE.equals(formDTO.getType())) { + //参与用户数、月 + list=userAnalysisDao.selectParticipationUserMonthIncr(myAgencyId); + } else { + logger.error("参数错误"); + return new ArrayList<>(); + } + for(UserIncrTrendResultDTO dim:dimList){ + boolean flag=false; + for(UserIncrTrendResDTO userIncrTrendResDTO:list){ + if(dim.getDateOrMonthId().equals(userIncrTrendResDTO.getDateIdOrMonthId())){ + flag=true; + //居民、热心居民、党员总数，用于排序 + switch(dim.getType()){ + case UserAnalysisConstant.REGISTERED_RESI: + dim.setValue(userIncrTrendResDTO.getRegIncr()); + break; + case UserAnalysisConstant.WARMHEARTED: + dim.setValue(userIncrTrendResDTO.getWarmIncr()); + break; + case UserAnalysisConstant.PARTYMEMBER: + dim.setValue(userIncrTrendResDTO.getPartymemberIncr()); + break; + default: + break; + } + + } + } + if(!flag){ + logger.error(String.format("机关id%s缺少记录dateOrMonthId=%s",myAgencyId,dim.getDateOrMonthId())); + } + } + return dimList; + } + + private List initUserIncrTrendResultDTO(String type) { + List list=new ArrayList<>(); + if(UserAnalysisConstant.DAY_TYPE.equals(type)){ + List dateIdList= DateUtils.getDaysBetween(DateUtils.getBeforeNDay(90), + DateUtils.getBeforeNDay(1)); + for(String dateId:dateIdList){ + String date=DateUtils.getxAxisDatePattern(dateId,"/"); + //居民 + UserIncrTrendResultDTO resi=new UserIncrTrendResultDTO(); + resi.setDate(date); + resi.setType(UserAnalysisConstant.REGISTERED_RESI); + resi.setValue(NumConstant.ZERO); + resi.setDateOrMonthId(dateId); + //热心居民 + UserIncrTrendResultDTO warm=new UserIncrTrendResultDTO(); + warm.setDate(date); + warm.setType(UserAnalysisConstant.WARMHEARTED); + warm.setValue(NumConstant.ZERO); + warm.setDateOrMonthId(dateId); + //党员 + UserIncrTrendResultDTO party=new UserIncrTrendResultDTO(); + party.setDate(date); + party.setType(UserAnalysisConstant.PARTYMEMBER); + party.setValue(NumConstant.ZERO); + party.setDateOrMonthId(dateId); + list.add(resi); + list.add(warm); + list.add(party); + } + }else if(UserAnalysisConstant.MONTH_TYPE.equals(type)){ + List monthList= DateUtils.getMonthBetween(DateUtils.getBeforeNMonth(12), + DateUtils.getBeforeNMonth(1)); + for(String monthId:monthList){ + String date=DateUtils.getxAxisDatePattern(monthId,"/"); + //居民 + UserIncrTrendResultDTO resi=new UserIncrTrendResultDTO(); + resi.setDate(date); + resi.setType(UserAnalysisConstant.REGISTERED_RESI); + resi.setValue(NumConstant.ZERO); + resi.setDateOrMonthId(monthId); + //热心居民 + UserIncrTrendResultDTO warm=new UserIncrTrendResultDTO(); + warm.setDate(date); + warm.setType(UserAnalysisConstant.WARMHEARTED); + warm.setValue(NumConstant.ZERO); + warm.setDateOrMonthId(monthId); + //党员 + UserIncrTrendResultDTO party=new UserIncrTrendResultDTO(); + party.setDate(date); + party.setType(UserAnalysisConstant.PARTYMEMBER); + party.setValue(NumConstant.ZERO); + party.setDateOrMonthId(monthId); + list.add(resi); + list.add(warm); + list.add(party); + } + } + return list; } + + + /*public static void main(String[] args) { +// System.out.println("前一天"+DateUtils.getBeforeNDay(1)); +// System.out.println("前90天"+DateUtils.getBeforeNDay(90)); + List list= DateUtils.getDaysBetween("201912","202005"); + for(String m:list){ + System.out.println(m); + } +// System.out.println(list.size()); + System.out.println("上个月"+DateUtils.getBeforeNMonth(1)); + System.out.println("前8个月"+DateUtils.getBeforeNMonth(8)); + + }*/ + } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml index f00dc28baf..408cf17e61 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml @@ -146,4 +146,74 @@ AND m.DATE_ID = #{dateId} AND m.AGENCY_ID = #{agencyId} + + + + + + + + + + \ No newline at end of file From 9554e2ec9ae6077e016c0436d792224b779ec82b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 11:55:41 +0800 Subject: [PATCH 07/34] =?UTF-8?q?auth=E6=9B=B4=E6=8D=A2=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8FappId,appSecret?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index b76386f7b3..a63457b568 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.20 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.21 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 5635559271..51b2074663 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.20 + 0.3.21 com.epmet epmet-cloud @@ -159,8 +159,8 @@ 111 111 - wx9b6102a8ee5add65 - 16fdb68bc2b3e732324ba5d8b8a9b5e2 + wx07674c23af51b521 + a2fd0d29b007cbbcf8c8dda8c693d99b wx3d1372029eb816a3 651f02d71ed3f123dfb584b8bf0f4d8b @@ -196,8 +196,8 @@ 111 111 - wx9b6102a8ee5add65 - 16fdb68bc2b3e732324ba5d8b8a9b5e2 + wx07674c23af51b521 + a2fd0d29b007cbbcf8c8dda8c693d99b wx3d1372029eb816a3 651f02d71ed3f123dfb584b8bf0f4d8b From 2987ddffa5fb1ca1722800fd81516cfd45155266 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 Jun 2020 12:27:21 +0800 Subject: [PATCH 08/34] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml index cde009a097..347c3c808c 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml @@ -137,8 +137,8 @@ - - + + @@ -151,7 +151,7 @@ - + From ba680314cac7ba162e340a947fc15f31ca7e6e54 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 Jun 2020 13:01:44 +0800 Subject: [PATCH 09/34] =?UTF-8?q?1.=E5=8A=A0=E5=85=A5sql=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E8=84=9A=E6=9C=AC=EF=BC=8Cflyway=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.1__init.sql | 716 ++++++++++++++++++ .../resources/db/migration/V2__DemoSql.sql | 4 - .../db/migration/epmet_gov_access.sql | 119 --- 3 files changed, 716 insertions(+), 123 deletions(-) create mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.1__init.sql delete mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql delete mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/epmet_gov_access.sql diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.1__init.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.1__init.sql new file mode 100644 index 0000000000..92aa71ac69 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.1__init.sql @@ -0,0 +1,716 @@ +/* + Navicat Premium Data Transfer + + Source Server : mini + Source Server Type : MySQL + Source Server Version : 50728 + Source Host : 192.168.1.130:3306 + Source Schema : epmet_gov_access + + Target Server Type : MySQL + Target Server Version : 50728 + File Encoding : 65001 + + Date: 23/06/2020 12:50:28 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for operation +-- ---------------------------- +DROP TABLE IF EXISTS `operation`; +CREATE TABLE `operation` ( + `ID` varchar(64) NOT NULL, + `OPERATION_KEY` varchar(64) NOT NULL, + `OPERATION_NAME` varchar(64) DEFAULT NULL, + `BRIEF` varchar(255) DEFAULT NULL COMMENT '操作简介', + `DEL_FLAG` tinyint(1) DEFAULT NULL, + `REVISION` int(10) DEFAULT NULL, + `CREATED_BY` varchar(64) DEFAULT NULL, + `CREATED_TIME` datetime DEFAULT NULL, + `UPDATED_BY` varchar(64) DEFAULT NULL, + `UPDATED_TIME` datetime DEFAULT NULL, + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='操作类型表'; + +-- ---------------------------- +-- Records of operation +-- ---------------------------- +BEGIN; +INSERT INTO `operation` VALUES ('035c19d96fc84456dd124ff1ca4c0eec', 'work_party_voice_edit', '党建声音:重新编辑', '', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); +INSERT INTO `operation` VALUES ('0511c52b0038893ac5ec7f855fd9eed0', 'work_party_voice_draft_delete', '党建声音:删除草稿', '删除草稿', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); +INSERT INTO `operation` VALUES ('08ddfdafec1f4baec02b807442936e1d', 'work_party_voice_publish', '党建声音:创建文章', '', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); +INSERT INTO `operation` VALUES ('0a311ae36071cd4b5a1fb6dd6df7d0ee', 'work_grassroots_party_branch_delete', '删除党支部', '支部管理-删除党支部', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); +INSERT INTO `operation` VALUES ('0d37e490e1a9e0e009aab000cc8f08d6', 'work_grassroots_party_member_delete', '删除党员', '支部管理-删除党员', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); +INSERT INTO `operation` VALUES ('1', 'org_staff_detail', '组织-工作人员-详情', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('17728bb2c1130ccda89b6fbd62652882', 'work_party_voice_offline', '党建声音:下线文章', '', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); +INSERT INTO `operation` VALUES ('1ecdb8e0febbd31cf6aae2ec69dcfb24', 'work_grassroots_issue_shift_project', '转项目', '转项目（选择处理部门api也需要添加此校验）', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('2', 'org_staff_list', '组织-工作人员-列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('224978fdf860a5792ed9b584e9b6218b', 'work_party_voice_detail', '党建声音:文章详情', '已发布详情、已下线详情', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); +INSERT INTO `operation` VALUES ('271e950dc966c821cf2896ce1258e53a', 'work_grassroots_resi_warmhearted_apply_detail', '基层治理:居民管理:热心居民申请详情', '基层治理:居民管理:查看热心居民申请详情', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('29c03074-8933-11ea-8bc0-c03fd56f7847', 'work_partyauth_auditinglist', '工作-党员认证-带审核列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('29cb91dd-8933-11ea-8bc0-c03fd56f7847', 'work_partyauth_auditedlist', '工作-党员认证-已认证列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('29d5c419-8933-11ea-8bc0-c03fd56f7847', 'work_partyauth_audithistory', '工作-党员认证-审核历史', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('29e82fa9-8933-11ea-8bc0-c03fd56f7847', 'work_partyauth_auditsubmit', '工作-党员认证-审核', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('2b6ed5299d1bab807be2ded38dcb1031', 'work_grassroots_party_member_edit', '编辑党员', '支部管理-编辑党员', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); +INSERT INTO `operation` VALUES ('3', 'org_staff_create', '组织-工作人员-新增', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('30ad909236bfc1a25e81a2c464b9f4a9', 'work_partyauth_audithistory_detail', '基层治理:党员认证:审核历史详情', '基层治理:党员认证:查看审核历史详情（自动审核失败、拒绝的）', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('3299cabaea5dbe4ef86cbd730331e950', 'work_project_trace_detail', '项目详情', '项目详情界面所有的api添加此校验', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('3c7e00fc7b6e25264ff623cd2c7134b0', 'work_grassroots_party_branch_edit', '编辑党支部', '支部管理-编辑党支部信息', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); +INSERT INTO `operation` VALUES ('3ccbf741b3236d37f4bf21084cb217c6', 'work_grassroots_group_apply_detail', '基层治理:群组管理:建组申请', '基层治理:群组管理:建组申请详情', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('455f472ab1bf5991dbafa692dc5b8c82', 'work_project_trace_transfer', '转其他部门', '转其他部门（选择处理部门api也需要添加此校验）', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('49813219e9a7d121854c4e7bb2403ddd', 'work_party_voice_draft_list', '党建声音:草稿箱列表', '草稿箱列表', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); +INSERT INTO `operation` VALUES ('53f4e5993d6581612543d78bc45eb95e', 'work_party_voice_published_list', '党建声音:已发布列表', '已发布文章列表查询', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); +INSERT INTO `operation` VALUES ('620c61520cec627300b3c2d98d142adc', 'work_party_voice_operation_list', '党建声音:查看文章操作记录', '', 0, 0, 'APP_USER', '2020-06-08 19:56:40', 'APP_USER', '2020-06-08 19:56:40'); +INSERT INTO `operation` VALUES ('63bba3a28258892714a820c47730534d', 'work_project_trace_close', '结案', '结案', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('721f616a0756a5120a78fda70fdeb025', 'work_grassroots_issue_voting_list', '表决中列', '表决中议题列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('7a9f1d15f5764bea3f5021de133420ee', 'work_grassroots_issue_close', '关闭议题', '关闭议题', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('88c4d9576bb17814ba798b7f8df30ada', 'work_party_voice_offline_list', '党建声音:已下线列表', '已下线文章列表', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); +INSERT INTO `operation` VALUES ('8cec055f4e03b7f44550d355ae4f8b60', 'work_grassroots_party_branch_add', '添加党支部', '支部管理-添加党支部', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); +INSERT INTO `operation` VALUES ('969a3e3c9b02743c49a435ca04b3845c', 'work_project_trace_involved_list', '我参与', '我参与的项目，列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('989946d1fce408dc35cdf978300bdce3', 'work_project_trace_return', '退回', '退回', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('a7979efa3624bff09f87bb640017feb2', 'work_partyauth_audited_detail', '基层治理:党员认证:已认证详情', '基层治理:党员认证:查看已认证党员详情', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('bce584d3-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_group_auditinglist', '基层治理-群组管理-待审核列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bcf370b2-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_group_audit', '基层治理-群组管理-审核建组', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd05028c-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_group_groupsinthegrid', '基层治理-群组管理-本网格小组列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd12fec2-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_resi_warmhearted_auditinglist', '基层治理-居民管理-热心居民待审核列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd29a0c1-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_resi_warmhearted_audithistorylist', '基层治理-居民管理-热心审核历史', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd351f39-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_resi_warmhearted_audit', '基层治理-居民管理-热心居民审核', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd419af5-8795-11ea-8bc0-c03fd56f7847', 'org_agency_trace', '组织-查看上级机关', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd4c8553-8795-11ea-8bc0-c03fd56f7847', 'org_agency_update', '组织-机关单位-编辑', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd5e0d32-8795-11ea-8bc0-c03fd56f7847', 'org_subagency_list', '组织-下级机关-列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd728674-8795-11ea-8bc0-c03fd56f7847', 'org_subagency_create', '组织-下级机关-新增', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd8379c0-8795-11ea-8bc0-c03fd56f7847', 'org_subagency_delete', '组织-下级机关-删除', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd8f4734-8795-11ea-8bc0-c03fd56f7847', 'org_staff_update', '组织-工作人员-编辑', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bd9ae0d0-8795-11ea-8bc0-c03fd56f7847', 'org_staff_forbidden', '组织-工作人员-禁用', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bda5128a-8795-11ea-8bc0-c03fd56f7847', 'org_department_list', '组织-直属部门-部门列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bdb6d0da-8795-11ea-8bc0-c03fd56f7847', 'org_department_create', '组织-直属部门-新增部门', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bdcd2bbc-8795-11ea-8bc0-c03fd56f7847', 'org_department_update', '组织-直属部门-编辑部门', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bdde783e-8795-11ea-8bc0-c03fd56f7847', 'org_department_delete', '组织-直属部门-删除', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bded2047-8795-11ea-8bc0-c03fd56f7847', 'org_department_staff_add', '组织-直属部门-添加人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('bdf922c2-8795-11ea-8bc0-c03fd56f7847', 'org_department_staff_remove', '组织-直属部门-移除人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('be0536c7-8795-11ea-8bc0-c03fd56f7847', 'org_department_staff_list', '组织-直属部门-人员列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('be1a30fd-8795-11ea-8bc0-c03fd56f7847', 'org_grid_list', '组织-治理网格-网格列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('be2d8d7f-8795-11ea-8bc0-c03fd56f7847', 'org_grid_create', '组织-治理网格-新增网格', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('be3b107c-8795-11ea-8bc0-c03fd56f7847', 'org_grid_update', '组织-治理网格-编辑网格', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('be492f40-8795-11ea-8bc0-c03fd56f7847', 'org_grid_delete', '组织-治理网格-删除', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('be5571ce-8795-11ea-8bc0-c03fd56f7847', 'org_grid_staff_add', '组织-治理网格-新增网格工作人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('be616786-8795-11ea-8bc0-c03fd56f7847', 'org_grid_staff_remove', '组织-治理网格-移除网格工作人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('be6d73fa-8795-11ea-8bc0-c03fd56f7847', 'org_partymember_summary', '组织-党员-汇总信息', NULL, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation` VALUES ('c5a97eaafe8c0a7e2b18133c3c5642cf', 'work_project_trace_pending_list', '待处理', '待处理的项目，列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('c8b203a4ef34bff5e37e175bb101c5ca', 'work_grassroots_party_member_add', '添加党员', '支部管理-添加党员', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); +INSERT INTO `operation` VALUES ('caa698937a169ca646341124a9868cfd', 'work_grassroots_issue_closed_list', '已关闭', '已关闭议题列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('cb88578ec778be4f0ab816c8375bc59a', 'work_grassroots_issue_shifted_project_list', '已转项目列表查询', '已转项目议题列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('cefc22ed6a226b257dbd41312ecd6d66', 'work_party_voice_draft_edit', '党建声音:编辑草稿', '编辑草稿', 0, 0, 'APP_USER', '2020-06-08 19:56:40', 'APP_USER', '2020-06-08 19:56:40'); +INSERT INTO `operation` VALUES ('cfa2e407e30a9c87a3e4ce4e6013a4f9', 'work_grassroots_group_audited', '基层治理:群组管理:审核历史', '基层治理:群组管理:审核历史列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('dee5672d4a08579280f4be886866a6c3', 'work_partyauth_auditing_detail', '基层治理:党员认证:待审核详情', '基层治理:党员认证:查看待审核详情', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('eb51c6570f62fc24b7754617bb698911', 'work_project_trace_created_list', '我发起', '我发起的项目，列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); +INSERT INTO `operation` VALUES ('work_grassroots_issue_detail', 'work_grassroots_issue_detail', '议题详情', '议题详情界面所有的api添加此校验', 0, NULL, NULL, NULL, NULL, NULL); +COMMIT; + +-- ---------------------------- +-- Table structure for operation_scope +-- ---------------------------- +DROP TABLE IF EXISTS `operation_scope`; +CREATE TABLE `operation_scope` ( + `ID` varchar(64) NOT NULL COMMENT 'id', + `SCOPE_KEY` varchar(30) NOT NULL COMMENT '范围key', + `SCOPE_NAME` varchar(30) NOT NULL COMMENT '范围名称', + `SCOPE_INDEX` varchar(30) NOT NULL COMMENT '范围序号', + `SERIES` varchar(30) NOT NULL COMMENT '范围所属系列', + `SORT` int(3) DEFAULT NULL COMMENT '排序字段', + `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权限范围表'; + +-- ---------------------------- +-- Records of operation_scope +-- ---------------------------- +BEGIN; +INSERT INTO `operation_scope` VALUES ('10', 'org_equal_and_sub', '同级组织及下级', 'oeb_10', 'org_level', 11, 1, NULL, NULL, '2020-04-29 19:01:37', NULL, NULL); +INSERT INTO `operation_scope` VALUES ('11', 'org_curr_sub', '本组织的下级', 'ocb_11', 'org_level', 9, 0, NULL, NULL, '2020-04-29 19:17:55', NULL, NULL); +INSERT INTO `operation_scope` VALUES ('12', 'org_equal_sub', '同级组织的下级', 'oeb_11', 'org_level', 13, 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('13', 'org_all', '所有组织', 'all', 'org_level', 4, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('14', 'org_curr_and_sup', '本组织及上级', 'ocp_10', 'org_level', 6, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('15', 'org_curr_sup', '本组织的上级', 'ocp_11', 'org_level', 5, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('16', 'org_equal_and_sup', '同级组织及上级', 'oep_10', 'org_level', 12, 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('17', 'org_equal_sup', '同级组织的上级', 'oep_11', 'org_level', 14, 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('18', 'i_created', '我创建的', 'ic_0', 'switch', 3, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('19', 'in_grid', '网格内', 'ig_0', 'switch', 2, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('2', 'org_curr', '本组织', 'oc_0', 'org_level', 7, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('20', 'in_department', '部门内', 'id_0', 'switch', 1, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('21', 'all', '无限制', 'all', 'all', 0, 0, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('3', 'org_equal', '同级组织', 'oe_0', 'org_level', 10, 1, NULL, NULL, NULL, NULL, NULL); +INSERT INTO `operation_scope` VALUES ('9', 'org_curr_and_sub', '本组织及下级', 'ocb_10', 'org_level', 8, 0, NULL, NULL, NULL, NULL, NULL); +COMMIT; + +-- ---------------------------- +-- Table structure for operation_scope_default +-- ---------------------------- +DROP TABLE IF EXISTS `operation_scope_default`; +CREATE TABLE `operation_scope_default` ( + `ID` varchar(64) NOT NULL COMMENT 'id', + `ROLE_KEY` varchar(50) DEFAULT NULL COMMENT '角色key', + `OPERATION_KEY` varchar(50) NOT NULL COMMENT '操作key', + `SCOPE_KEY` varchar(50) NOT NULL COMMENT '范围key', + `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='默认操作范围表'; + +-- ---------------------------- +-- Records of operation_scope_default +-- ---------------------------- +BEGIN; +INSERT INTO `operation_scope_default` VALUES ('005e11b48b1d2edf2f15936e7f74a2bc', 'grid_manager', 'work_grassroots_issue_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:16', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:16'); +INSERT INTO `operation_scope_default` VALUES ('00995b8408b605dfd7d52d3f25d8d1bb', 'grid_member', 'work_grassroots_group_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:26', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:26'); +INSERT INTO `operation_scope_default` VALUES ('00d50303addf5092330b670e6f3bf11b', 'grid_member', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:40', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:40'); +INSERT INTO `operation_scope_default` VALUES ('00fc3e2c97d1a34dda0888c3e37d0955', 'grid_member', 'work_grassroots_resi_warmhearted_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:57', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:57'); +INSERT INTO `operation_scope_default` VALUES ('01a8200c4ce4a71609e13f6bfc098d52', 'grid_manager', 'work_partyauth_audithistory_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:14'); +INSERT INTO `operation_scope_default` VALUES ('01ace7724d783ca5c003144913136241', 'grid_member', 'work_grassroots_party_branch_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:54', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:54'); +INSERT INTO `operation_scope_default` VALUES ('01c29c0332ddb06092fb61153d0c2c9c', 'agency_leader', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:14', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:14'); +INSERT INTO `operation_scope_default` VALUES ('035a25c3a5dcbb91149d5cbc818fd85d', 'manager', 'org_department_staff_add', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:58'); +INSERT INTO `operation_scope_default` VALUES ('05d9a44e61d0625c1d68682e75f7ce19', 'manager', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:58'); +INSERT INTO `operation_scope_default` VALUES ('062d53e8a76a815e64f93066b01b702c', 'grid_manager', 'work_grassroots_party_branch_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:31'); +INSERT INTO `operation_scope_default` VALUES ('0abf659ec8d0b2525052d3468b27905a', 'staff', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:10'); +INSERT INTO `operation_scope_default` VALUES ('0ea46f18afbcb60f485da3630cad1b70', 'party_principals', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:39'); +INSERT INTO `operation_scope_default` VALUES ('125c02cb1057ed636e12aa590a0c475b', 'manager', 'org_agency_update', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:35'); +INSERT INTO `operation_scope_default` VALUES ('159b03f72a404f07810a61f00ba552da', 'party_principals', 'work_party_voice_offline_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:10'); +INSERT INTO `operation_scope_default` VALUES ('16541f252fc7b814edc47feaaa5c26ee', 'grid_member', 'work_grassroots_group_audited', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:17', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:17'); +INSERT INTO `operation_scope_default` VALUES ('1791de862b12d6ba5afa03ed6df72cbd', 'grid_manager', 'work_grassroots_resi_warmhearted_audithistorylist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:45'); +INSERT INTO `operation_scope_default` VALUES ('18698932d1046f6eb64163d93f6a32c9', 'agency_leader', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:25', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:25'); +INSERT INTO `operation_scope_default` VALUES ('190282d7e12308661ab145c02d9b2186', 'party_principals', 'work_grassroots_party_branch_delete', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:49'); +INSERT INTO `operation_scope_default` VALUES ('1b57196d45cf870466638c73ed6b0303', 'agency_leader', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:20'); +INSERT INTO `operation_scope_default` VALUES ('1b8b9e715569e6e391de39f33a63c370', 'grid_member', 'work_grassroots_issue_shift_project', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:42', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:42'); +INSERT INTO `operation_scope_default` VALUES ('1c0d6fd0e0edd73de3dfaba59fc703c8', 'manager', 'org_department_delete', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:48'); +INSERT INTO `operation_scope_default` VALUES ('1c8a65da9664be7caa3f823dbbe0992d', 'dept_leader', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:13'); +INSERT INTO `operation_scope_default` VALUES ('1ce6cfa7ac3e03fed33e097088571322', 'manager', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:01'); +INSERT INTO `operation_scope_default` VALUES ('1d62ec213a0b103c58e181e4d84e2a3b', 'grid_party_director', 'work_grassroots_resi_warmhearted_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:08', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:08'); +INSERT INTO `operation_scope_default` VALUES ('1f51f59e4790440bceda0d33d9d2d704', 'grid_manager', 'work_partyauth_audited_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:47', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:47'); +INSERT INTO `operation_scope_default` VALUES ('2008244ebf45816c7a618185445e9939', 'manager', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:48'); +INSERT INTO `operation_scope_default` VALUES ('20ab79d3dea57c3181de12c6475c43bf', 'staff', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:06'); +INSERT INTO `operation_scope_default` VALUES ('223dfb7709ca4fcac60c3bf04a323fd2', 'grid_member', 'work_partyauth_audithistory_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:03'); +INSERT INTO `operation_scope_default` VALUES ('24174419d9d24ec0e6dd0f4a62423ffa', 'grid_party_director', 'work_party_voice_offline_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:22'); +INSERT INTO `operation_scope_default` VALUES ('244936f71cfbc04d6d05b09d69ffd128', 'grid_manager', 'work_grassroots_issue_shift_project', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:09', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:09'); +INSERT INTO `operation_scope_default` VALUES ('2666f4515e82849524dcfc927ffd46f2', 'grid_member', 'work_grassroots_group_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:27', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:27'); +INSERT INTO `operation_scope_default` VALUES ('28aedd888677fea7a18eee789481eff7', 'staff', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:37', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:37'); +INSERT INTO `operation_scope_default` VALUES ('297f4e4c1dccaef15de2927d5b81add0', 'grid_party_director', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:52', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:52'); +INSERT INTO `operation_scope_default` VALUES ('29c7c2912bb0daaffe173c50b0f269db', 'dept_leader', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:22'); +INSERT INTO `operation_scope_default` VALUES ('2af6b2b529a6613ebbdb8a578e40d816', 'grid_manager', 'work_partyauth_auditedlist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:36', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:36'); +INSERT INTO `operation_scope_default` VALUES ('2bae15afc6d0b671e83a2e5eb5aa015d', 'grid_member', 'work_grassroots_party_branch_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:15', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:15'); +INSERT INTO `operation_scope_default` VALUES ('2f687a6ae42c715d338c2a2f3284c220', 'grid_manager', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:31'); +INSERT INTO `operation_scope_default` VALUES ('2f7392ddda64b92fc87e4feaf9c99660', 'grid_party_director', 'work_partyauth_auditsubmit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:44'); +INSERT INTO `operation_scope_default` VALUES ('2f875b47a242864293a0a2bb96696502', 'grid_manager', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:06'); +INSERT INTO `operation_scope_default` VALUES ('33c5f62e11b3e09f7d01638498dae150', 'agency_leader', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:51'); +INSERT INTO `operation_scope_default` VALUES ('34f389145a9e9deb29cc855951cba433', 'grid_member', 'work_partyauth_auditsubmit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:32', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:32'); +INSERT INTO `operation_scope_default` VALUES ('3591b5f7d1926846c6ce84961a83379f', 'manager', 'org_department_update', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:37', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:37'); +INSERT INTO `operation_scope_default` VALUES ('35a68d37b59fe83451f8ad71394eed61', 'staff', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:27'); +INSERT INTO `operation_scope_default` VALUES ('3763443eece5d7b092d5f53e9db09fe7', 'grid_manager', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:50'); +INSERT INTO `operation_scope_default` VALUES ('37bf4e989e3b0390f4fed66184877b8f', 'grid_member', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:57', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:57'); +INSERT INTO `operation_scope_default` VALUES ('37fd9e080ce3ed93782d2cf6bf8b26e8', 'grid_manager', 'work_grassroots_party_branch_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:39', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:39'); +INSERT INTO `operation_scope_default` VALUES ('383cb9fdd17dc136f1e13bbce40ce82e', 'grid_member', 'work_partyauth_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:16', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:16'); +INSERT INTO `operation_scope_default` VALUES ('38554966ff80a640900a42b794c0accc', 'grid_manager', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:11'); +INSERT INTO `operation_scope_default` VALUES ('39457ab5872d584b8f4a080bff689743', 'grid_member', 'work_grassroots_issue_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:44'); +INSERT INTO `operation_scope_default` VALUES ('396a786f5f77cacde1dd488211d35594', 'grid_member', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:01'); +INSERT INTO `operation_scope_default` VALUES ('3b0e3fc804eee29ed3531132d0fd728f', 'grid_manager', 'work_grassroots_group_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:57', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:57'); +INSERT INTO `operation_scope_default` VALUES ('3b33a31aebd25a4ca01eecba32e211c4', 'manager', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:50'); +INSERT INTO `operation_scope_default` VALUES ('3b538bdddb7b0fe94add13b8fa70a759', 'grid_manager', 'work_grassroots_resi_warmhearted_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:36', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:36'); +INSERT INTO `operation_scope_default` VALUES ('3e0b90020d34005761a50fc4bfcfc685', 'grid_member', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:08', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:08'); +INSERT INTO `operation_scope_default` VALUES ('3e544119acfc7c7031526e78cfe5f62d', 'grid_member', 'work_grassroots_party_member_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:36', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:36'); +INSERT INTO `operation_scope_default` VALUES ('3f3f96a431559f8ed638e39b6c197530', 'grid_party_director', 'work_grassroots_group_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:45'); +INSERT INTO `operation_scope_default` VALUES ('3fa5168d047ad1e21e8657b09f227225', 'grid_manager', 'work_grassroots_party_branch_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:34', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:34'); +INSERT INTO `operation_scope_default` VALUES ('4082322584867a369c5e94779246cc05', 'grid_manager', 'work_partyauth_audithistory', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:45'); +INSERT INTO `operation_scope_default` VALUES ('42115bb11432c859bfaeaea094c82be8', 'grid_party_director', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:03'); +INSERT INTO `operation_scope_default` VALUES ('44a83d61ade712a22d544fa007723f36', 'grid_member', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:39'); +INSERT INTO `operation_scope_default` VALUES ('458db3ff13ee19e2491623a92a260db6', 'grid_party_director', 'work_grassroots_group_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:56', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:56'); +INSERT INTO `operation_scope_default` VALUES ('49398958f84560c5dd58cb2f45202aad', 'grid_party_director', 'work_party_voice_operation_list', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:59', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:59'); +INSERT INTO `operation_scope_default` VALUES ('4b5a767b3b632dcd6b8eb7a4be67885a', 'grid_member', 'work_grassroots_resi_warmhearted_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:20', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:20'); +INSERT INTO `operation_scope_default` VALUES ('4b7773f4458c145453f94c56c0aae305', 'manager', 'org_department_staff_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:19:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:19:50'); +INSERT INTO `operation_scope_default` VALUES ('4cf54beefdcebdc7d689175ad364e445', 'grid_member', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:29', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:29'); +INSERT INTO `operation_scope_default` VALUES ('4e5e0669b318ba33bae9d46ffba3fc95', 'manager', 'org_staff_update', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:42', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:42'); +INSERT INTO `operation_scope_default` VALUES ('4f7362d44df8a4970072841b6ef540e9', 'manager', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:00', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:00'); +INSERT INTO `operation_scope_default` VALUES ('4f9fbbbb70925e094cc50b2bf6ea7a49', 'manager', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:29', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:29'); +INSERT INTO `operation_scope_default` VALUES ('503af7d61aaabbc241d96f502eb1a16c', 'grid_party_director', 'work_grassroots_group_audited', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:24', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:24'); +INSERT INTO `operation_scope_default` VALUES ('5198ab882e61bced176df85026037af0', 'party_principals', 'work_party_voice_draft_delete', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:07'); +INSERT INTO `operation_scope_default` VALUES ('5296adedb2c58173d78ebeb43ebf4208', 'grid_member', 'work_grassroots_issue_close', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:55', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:55'); +INSERT INTO `operation_scope_default` VALUES ('539e31dfdce43c219535fcdab78b4766', 'grid_member', 'work_partyauth_auditedlist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:24:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:24:01'); +INSERT INTO `operation_scope_default` VALUES ('53f1ce7c063129dfed8fabcbcf635077', 'grid_party_director', 'work_grassroots_resi_warmhearted_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:15', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:15'); +INSERT INTO `operation_scope_default` VALUES ('56f453892fd7775b5ab07b187e5e572c', 'dept_leader', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:20'); +INSERT INTO `operation_scope_default` VALUES ('5824e979697e95ea86900056aa5467dd', 'manager', 'org_subagency_create', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:50'); +INSERT INTO `operation_scope_default` VALUES ('5900abb52724dac8afb69c5e6de2b043', 'manager', 'org_department_staff_remove', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:17:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:17:09'); +INSERT INTO `operation_scope_default` VALUES ('59f43f04ffa9dce8bc2e769cb1e06827', 'grid_member', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:13'); +INSERT INTO `operation_scope_default` VALUES ('5acb04aa4d836215587ddf4d0b951e3b', 'agency_leader', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:13'); +INSERT INTO `operation_scope_default` VALUES ('5afc450812bbc361c75aba06bd8af014', 'grid_manager', 'work_grassroots_issue_closed_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:14'); +INSERT INTO `operation_scope_default` VALUES ('5d64e24de420efd09ef16ff726ef4d85', 'staff', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:51:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:51:03'); +INSERT INTO `operation_scope_default` VALUES ('5e4a7ca32c1041d9000d372894c7d3d4', 'manager', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:35'); +INSERT INTO `operation_scope_default` VALUES ('5f0015d9c48ca9b7c80b1e7529e1fe60', 'grid_party_director', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:16'); +INSERT INTO `operation_scope_default` VALUES ('5f3724c18929a7846aa3673a9e15e85d', 'grid_party_director', 'work_partyauth_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:03'); +INSERT INTO `operation_scope_default` VALUES ('60563f47db3317b54803976d0528c949', 'grid_party_director', 'work_party_voice_draft_delete', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:26'); +INSERT INTO `operation_scope_default` VALUES ('605f091e0eeb0e148819ef544cfe4182', 'party_principals', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:23'); +INSERT INTO `operation_scope_default` VALUES ('621d0cbb47a545da6a8887345fce17a6', 'manager', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:35'); +INSERT INTO `operation_scope_default` VALUES ('62418f632d4cf93890ab2d6ccde8198e', 'grid_manager', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:13'); +INSERT INTO `operation_scope_default` VALUES ('64444359ebda79fb10e47f4467ecafb9', 'party_principals', 'work_party_voice_edit', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:13:57', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:13:57'); +INSERT INTO `operation_scope_default` VALUES ('64cc78ba21250aa7a2bb70a8509f3554', 'party_principals', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:33'); +INSERT INTO `operation_scope_default` VALUES ('650eb56c96184deed44769b09f206e6c', 'grid_manager', 'work_grassroots_resi_warmhearted_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:00', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:00'); +INSERT INTO `operation_scope_default` VALUES ('65a32edbb9475146a6ed357132f01a73', 'dept_leader', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:24', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:24'); +INSERT INTO `operation_scope_default` VALUES ('65c4a3f626c710ed230769854d7b2e4e', 'grid_party_director', 'work_grassroots_party_member_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:16', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:16'); +INSERT INTO `operation_scope_default` VALUES ('669f225859cae2e64ab22ec9bc282ed3', 'grid_member', 'work_grassroots_party_branch_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:06', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:06'); +INSERT INTO `operation_scope_default` VALUES ('6c06585e36a5042ada9cf411f26a3c37', 'grid_party_director', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:32'); +INSERT INTO `operation_scope_default` VALUES ('6e5618d97249d6105e0953fc849ab5fd', 'grid_manager', 'work_partyauth_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:55', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:55'); +INSERT INTO `operation_scope_default` VALUES ('6e58133d47a9b768e014fece7f71705a', 'grid_party_director', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:30', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:30'); +INSERT INTO `operation_scope_default` VALUES ('70ef0720278dbc3560fe5c5f299e9220', 'dept_leader', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:11'); +INSERT INTO `operation_scope_default` VALUES ('72412f5fb6585ab0148d62a784e1ffbb', 'manager', 'org_staff_create', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:22'); +INSERT INTO `operation_scope_default` VALUES ('7441cdd97b691f153ee8e3b648fe456c', 'grid_party_director', 'work_grassroots_party_member_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:53', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:53'); +INSERT INTO `operation_scope_default` VALUES ('74baf9bd02f28c2c9ce375ad5e338ac7', 'grid_member', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:51'); +INSERT INTO `operation_scope_default` VALUES ('766d53e391838c3eeb362da528a8217d', 'grid_party_director', 'work_grassroots_resi_warmhearted_audithistorylist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:24', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:24'); +INSERT INTO `operation_scope_default` VALUES ('776e33172c8db19c1e40576ad33b38a6', 'agency_leader', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:05', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:05'); +INSERT INTO `operation_scope_default` VALUES ('777666e0e8a282443b27f7a22d05ec10', 'grid_party_director', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:22'); +INSERT INTO `operation_scope_default` VALUES ('792b4efe040ba2f8bf549ab936e5c407', 'grid_party_director', 'work_grassroots_resi_warmhearted_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:34', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:34'); +INSERT INTO `operation_scope_default` VALUES ('7a79a35f95edada16cd6d2a355b46fa8', 'agency_leader', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:26:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:26:27'); +INSERT INTO `operation_scope_default` VALUES ('7b0365f01be8d3f255833ba71bccd784', 'agency_leader', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:41', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:41'); +INSERT INTO `operation_scope_default` VALUES ('7b0c3e7f224c4d294746674e52240ea2', 'manager', 'org_department_create', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:26'); +INSERT INTO `operation_scope_default` VALUES ('7df6cc5ce7d7322855d7e669e9799f58', 'grid_party_director', 'work_grassroots_issue_shifted_project_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:12'); +INSERT INTO `operation_scope_default` VALUES ('7e5968a3c00f7ca3541c919ee6d36c52', 'grid_manager', 'work_partyauth_auditing_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:56', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:56'); +INSERT INTO `operation_scope_default` VALUES ('7ea897ef4722afa539926f4913a036f4', 'grid_manager', 'work_partyauth_auditsubmit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:54', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:54'); +INSERT INTO `operation_scope_default` VALUES ('801798f76e9d48a580e339c2b6e06a0c', 'agency_leader', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:04', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:04'); +INSERT INTO `operation_scope_default` VALUES ('8041825db8139cf47223a6647032c8d7', 'staff', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:34'); +INSERT INTO `operation_scope_default` VALUES ('80d127cff9293afa420f2b79808cf4d9', 'manager', 'org_grid_delete', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:55', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:55'); +INSERT INTO `operation_scope_default` VALUES ('811da25e14102eee984c0062ecfaf6e1', 'dept_leader', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:36', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:36'); +INSERT INTO `operation_scope_default` VALUES ('836dca9906b0980822429899ede19fc5', 'grid_party_director', 'work_grassroots_issue_close', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:10', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:10'); +INSERT INTO `operation_scope_default` VALUES ('83a5be91a21541cc8effffd633ff9444', 'manager', 'org_grid_staff_add', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:18'); +INSERT INTO `operation_scope_default` VALUES ('84873167c55f600ae83c00e41349854b', 'grid_member', 'work_grassroots_issue_voting_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:42', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:42'); +INSERT INTO `operation_scope_default` VALUES ('84c8107ec8d962371b757e9a34433143', 'party_principals', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:12', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:12'); +INSERT INTO `operation_scope_default` VALUES ('8590536d16f6d8a199ccef8b3b356d55', 'grid_party_director', 'work_grassroots_issue_shift_project', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:17', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:17'); +INSERT INTO `operation_scope_default` VALUES ('865355b47bb3bc46b9fb187585d10ad4', 'grid_party_director', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:49'); +INSERT INTO `operation_scope_default` VALUES ('86e7f717a125b93249b501fc7bfec5c8', 'staff', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:49'); +INSERT INTO `operation_scope_default` VALUES ('86f5eb8adb05164952e320caf310fa5f', 'manager', 'org_staff_forbidden', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:52', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:52'); +INSERT INTO `operation_scope_default` VALUES ('894c0602d250347b64974021878164a1', 'dept_leader', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:00', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:00'); +INSERT INTO `operation_scope_default` VALUES ('8b5f14f053be2b1e3223f31149ff4daf', 'grid_party_director', 'work_grassroots_issue_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:01'); +INSERT INTO `operation_scope_default` VALUES ('8b9fc990891638326b2b8eb26a59f4ac', 'grid_member', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:20'); +INSERT INTO `operation_scope_default` VALUES ('8bdc313c8809f7daf191fa2cab3e40cc', 'grid_member', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:24', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:24'); +INSERT INTO `operation_scope_default` VALUES ('8c9402c095a773c86f3354482f0352cd', 'grid_member', 'work_grassroots_issue_shifted_project_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:07', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:07'); +INSERT INTO `operation_scope_default` VALUES ('8cd953967f9f0e4892006753862e134c', 'grid_manager', 'work_grassroots_group_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:19', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:19'); +INSERT INTO `operation_scope_default` VALUES ('8d96cdbed7827e5e6353eace6724ea71', 'dept_leader', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:41', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:41'); +INSERT INTO `operation_scope_default` VALUES ('8ed5155bba9db8ac31205109310e8ed0', 'grid_manager', 'work_grassroots_issue_voting_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:01'); +INSERT INTO `operation_scope_default` VALUES ('8f08756a9eccb34522b6893542b5b3e9', 'grid_member', 'work_grassroots_party_member_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:26', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:26'); +INSERT INTO `operation_scope_default` VALUES ('8f7abe8da228e30e832f66523991ed87', 'grid_party_director', 'work_grassroots_party_branch_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:44'); +INSERT INTO `operation_scope_default` VALUES ('905c8e92495bec07a607e856b93b82ec', 'grid_party_director', 'work_grassroots_party_branch_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:25', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:25'); +INSERT INTO `operation_scope_default` VALUES ('909747637a3b1621b73f7d22a5761af3', 'party_principals', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:56'); +INSERT INTO `operation_scope_default` VALUES ('931252405255a8d9f6183e09e473c9ee', 'grid_party_director', 'work_party_voice_offline', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:33'); +INSERT INTO `operation_scope_default` VALUES ('943b4613b7102cfaf2ff85e56f55c4c6', 'grid_member', 'work_grassroots_party_member_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:43', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:43'); +INSERT INTO `operation_scope_default` VALUES ('9447e685c8878c772822481748b5fc71', 'agency_leader', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:26'); +INSERT INTO `operation_scope_default` VALUES ('9520a5ce4fc77223582e626904526e51', 'party_principals', 'work_party_voice_offline', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:19'); +INSERT INTO `operation_scope_default` VALUES ('956081e29921b396d8174fb882b7e06d', 'manager', 'org_grid_update', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:23'); +INSERT INTO `operation_scope_default` VALUES ('973b61d113a5eeb25e620a7ba89743e7', 'party_principals', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:16'); +INSERT INTO `operation_scope_default` VALUES ('9745482a6c37e3c7d5d637ce08ceb027', 'grid_party_director', 'work_partyauth_audithistory', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:35'); +INSERT INTO `operation_scope_default` VALUES ('978629e311c0d748c116a84904b412dd', 'staff', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:11'); +INSERT INTO `operation_scope_default` VALUES ('97f317e04a13582486f189510a93e880', 'dept_leader', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:34'); +INSERT INTO `operation_scope_default` VALUES ('99f907b51206171d5db3d13cbbb176ed', 'grid_manager', 'work_grassroots_party_member_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:04', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:04'); +INSERT INTO `operation_scope_default` VALUES ('9c203f0f3050b0336b6251066d538f3b', 'grid_party_director', 'work_grassroots_party_branch_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:19', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:19'); +INSERT INTO `operation_scope_default` VALUES ('9cce12dbb0056d537da114b08e91a92b', 'grid_member', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:07'); +INSERT INTO `operation_scope_default` VALUES ('9e51fae7254e1cbce1a54dfaaee5cb5b', 'grid_member', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:31'); +INSERT INTO `operation_scope_default` VALUES ('a0709146050af12b6de358d22f8e6321', 'grid_member', 'work_grassroots_issue_closed_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:46', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:46'); +INSERT INTO `operation_scope_default` VALUES ('a36f8291cc5d1f1d36e43ccd2fb31af9', 'grid_manager', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:18'); +INSERT INTO `operation_scope_default` VALUES ('a40d4eea9f171ef852c39ac3e9717afb', 'grid_manager', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:18'); +INSERT INTO `operation_scope_default` VALUES ('a47aef1ba94e2792f392774a53066eba', 'party_principals', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:47'); +INSERT INTO `operation_scope_default` VALUES ('a52ed73b6d8cce3898dc869f59134185', 'party_principals', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:09'); +INSERT INTO `operation_scope_default` VALUES ('a5be520b00e9c6a8fa90860c9417408b', 'party_principals', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:22:55', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:22:55'); +INSERT INTO `operation_scope_default` VALUES ('a605d56a98d9f1855a65d4826c39d75a', 'grid_party_director', 'work_grassroots_group_groupsinthegrid', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:05', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:05'); +INSERT INTO `operation_scope_default` VALUES ('a691a1d4df99cb9004d153e134ca67e9', 'staff', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:41', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:41'); +INSERT INTO `operation_scope_default` VALUES ('a7975a24ff0c8e37e5e1a332619c1ad3', 'grid_party_director', 'work_grassroots_party_member_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:56', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:56'); +INSERT INTO `operation_scope_default` VALUES ('a904dac982ee5dedf6871e8cd6d1d254', 'grid_member', 'work_grassroots_group_groupsinthegrid', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:47', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:47'); +INSERT INTO `operation_scope_default` VALUES ('aa0b0c536d511c533346a7b7b1b60407', 'grid_manager', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:38'); +INSERT INTO `operation_scope_default` VALUES ('aab5bdcade38cea38b0c275a5f3261e5', 'party_principals', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:47'); +INSERT INTO `operation_scope_default` VALUES ('abf92c6f4c5f9eb56567b9851c37305c', 'party_principals', 'work_grassroots_issue_shift_project', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:13'); +INSERT INTO `operation_scope_default` VALUES ('ac538be1c85cf690cdc94d61415cd571', 'dept_leader', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:52', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:52'); +INSERT INTO `operation_scope_default` VALUES ('ae33a07bf783947505f0ff9409927e17', 'manager', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:36', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:36'); +INSERT INTO `operation_scope_default` VALUES ('aed23c89f04989327fe40203fcd6701e', 'grid_party_director', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:04', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:04'); +INSERT INTO `operation_scope_default` VALUES ('b0325a2a39ed5d66e71e71a3ebe9eb21', 'grid_manager', 'work_grassroots_group_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:44'); +INSERT INTO `operation_scope_default` VALUES ('b2560da4979e8db491d62a59ce87b11d', 'party_principals', 'work_grassroots_resi_warmhearted_apply_detail', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:27'); +INSERT INTO `operation_scope_default` VALUES ('b26c6a55ce17bdf7cca1d2a8b7c0a2d9', 'staff', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:37', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:37'); +INSERT INTO `operation_scope_default` VALUES ('b475b35a3b45b568ab7d463a00f507ad', 'party_principals', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:31'); +INSERT INTO `operation_scope_default` VALUES ('b48a5a2f83c99a87b7bca35e93f9bf2b', 'manager', 'org_grid_create', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:13'); +INSERT INTO `operation_scope_default` VALUES ('b711480a6dfdaf1d73ab4fca481d5fa5', 'grid_manager', 'work_grassroots_group_audited', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:47', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:47'); +INSERT INTO `operation_scope_default` VALUES ('b920dbcac89fd79253eb16cb794e029c', 'manager', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:18'); +INSERT INTO `operation_scope_default` VALUES ('bb03d34358fb1376acd36cacc68aa5bd', 'staff', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:15', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:15'); +INSERT INTO `operation_scope_default` VALUES ('bb408b9da51f7b26e15105acb4f209c7', 'grid_manager', 'work_grassroots_issue_close', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:14'); +INSERT INTO `operation_scope_default` VALUES ('bc0b10f96d6fc63b82dde85613eb6804', 'manager', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:49'); +INSERT INTO `operation_scope_default` VALUES ('bc671716457f328ffd82b97a7f724947', 'grid_party_director', 'work_partyauth_auditedlist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:52', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:52'); +INSERT INTO `operation_scope_default` VALUES ('bd2fa250be4a3fb4822a5db52fcb8408', 'grid_manager', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:25', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:25'); +INSERT INTO `operation_scope_default` VALUES ('be471af1df9a68555fdaa341b93b2df1', 'grid_member', 'work_partyauth_audithistory', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:22', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:22'); +INSERT INTO `operation_scope_default` VALUES ('bf9bd00ab2d2186b73e8ce32cb79e45e', 'agency_leader', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:07'); +INSERT INTO `operation_scope_default` VALUES ('bfe9a6257cbe901664eaa568483d6f79', 'party_principals', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:23'); +INSERT INTO `operation_scope_default` VALUES ('c0363507ea85a756e0d8badb00dc1832', 'grid_party_director', 'work_grassroots_issue_closed_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:03'); +INSERT INTO `operation_scope_default` VALUES ('c16d9e353b14c714edf16f88c7930b6a', 'grid_party_director', 'work_partyauth_audithistory_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:09', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:09'); +INSERT INTO `operation_scope_default` VALUES ('c83dd1940246d39ee1609b4de7bd086a', 'grid_member', 'work_grassroots_group_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:38', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:38'); +INSERT INTO `operation_scope_default` VALUES ('c96f7bd4cec8f8993f6acb6edf91ea46', 'staff', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:44'); +INSERT INTO `operation_scope_default` VALUES ('cd5486edb6ebd18cdbde3b33d70f0132', 'agency_leader', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:05:53', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:05:53'); +INSERT INTO `operation_scope_default` VALUES ('cef6440af3e4a7c94276bcf7ec7f825a', 'grid_party_director', 'work_partyauth_auditing_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:35'); +INSERT INTO `operation_scope_default` VALUES ('d22829031515a75a7dcfcda1b899d5a7', 'grid_manager', 'work_grassroots_resi_warmhearted_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:55', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:55'); +INSERT INTO `operation_scope_default` VALUES ('d3326317f36b4e6fdf6787849c3206f6', 'grid_manager', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:42', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:42'); +INSERT INTO `operation_scope_default` VALUES ('d4fe8198b7b59317d126007174e7ee3d', 'grid_manager', 'work_party_voice_operation_list', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:49'); +INSERT INTO `operation_scope_default` VALUES ('d63c06501cffc7c720522acaae4e9ce2', 'staff', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:13'); +INSERT INTO `operation_scope_default` VALUES ('d6407f2c31bef4a94e22e6e9a880cde3', 'grid_member', 'work_grassroots_resi_warmhearted_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:16', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:16'); +INSERT INTO `operation_scope_default` VALUES ('d661f0497d3904104d03a0cc85ecec13', 'party_principals', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:26'); +INSERT INTO `operation_scope_default` VALUES ('d6db94218b8aba5850e336d21438b889', 'grid_party_director', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:43', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:43'); +INSERT INTO `operation_scope_default` VALUES ('da2a31d3a108b66f4527b9d571bc0d04', 'grid_party_director', 'work_grassroots_issue_voting_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:58', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:58'); +INSERT INTO `operation_scope_default` VALUES ('db07037c89e5bdc9d1caf844405c13f9', 'party_principals', 'work_party_voice_draft_edit', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:05', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:05'); +INSERT INTO `operation_scope_default` VALUES ('db20d026f4913af40b73df80843ca0c3', 'staff', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:38'); +INSERT INTO `operation_scope_default` VALUES ('dbaa0ea119fb0f0a18b975f7c8098351', 'manager', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:05', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:05'); +INSERT INTO `operation_scope_default` VALUES ('dd61e8d1975a629f0e7d049a7d3284a1', 'staff', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:58'); +INSERT INTO `operation_scope_default` VALUES ('ddc84057af63feea8e46cb02bde6f33a', 'grid_party_director', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:26'); +INSERT INTO `operation_scope_default` VALUES ('dde82049def92331e3605bb77a281e1e', 'dept_leader', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:44'); +INSERT INTO `operation_scope_default` VALUES ('de06cabd468ccc9b4fb05cb741438229', 'agency_leader', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:48'); +INSERT INTO `operation_scope_default` VALUES ('def1b3b2ee4d28b80400bd03ce9e493a', 'grid_member', 'work_party_voice_operation_list', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:54:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:54:13'); +INSERT INTO `operation_scope_default` VALUES ('df0aa5d70212e74f63ffff0aadc4d343', 'grid_party_director', 'work_grassroots_group_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:45'); +INSERT INTO `operation_scope_default` VALUES ('df3b0048d163d9b4fa7249e5aaaa7491', 'grid_manager', 'work_grassroots_issue_shifted_project_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:28', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:28'); +INSERT INTO `operation_scope_default` VALUES ('e4dc754c75c7b4c9ba422386a6e1645b', 'grid_member', 'work_partyauth_audited_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:15', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:15'); +INSERT INTO `operation_scope_default` VALUES ('e635076b7812e513bc13c957e2781d3c', 'party_principals', 'work_party_voice_draft_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:01'); +INSERT INTO `operation_scope_default` VALUES ('e6ebb15d07698787238d1f05073918d0', 'grid_party_director', 'work_party_voice_draft_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:10'); +INSERT INTO `operation_scope_default` VALUES ('e7310fb01bb0d69d1ec3d620951ab93b', 'party_principals', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:28'); +INSERT INTO `operation_scope_default` VALUES ('e770cde77d409093bdc951ed3d03c79d', 'manager', 'org_subagency_delete', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:31'); +INSERT INTO `operation_scope_default` VALUES ('e7d10067e11bf2ee20ecc2fc8a64fccd', 'grid_party_director', 'work_partyauth_audited_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:35'); +INSERT INTO `operation_scope_default` VALUES ('e9e1187bbbc8e5283cfe1710e6d601d5', 'manager', 'org_grid_staff_remove', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:32'); +INSERT INTO `operation_scope_default` VALUES ('ecf49efa4d2b4c7d6fa06dc4ef7ec385', 'grid_party_director', 'work_party_voice_edit', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:23'); +INSERT INTO `operation_scope_default` VALUES ('f0a92070c06ada2336463b47f7761211', 'grid_party_director', 'work_party_voice_draft_edit', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:58'); +INSERT INTO `operation_scope_default` VALUES ('f26e3c4c0fc7b7a34e9354cd74b7617b', 'grid_manager', 'work_grassroots_group_groupsinthegrid', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:27', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:27'); +INSERT INTO `operation_scope_default` VALUES ('f3b96229505218a2e2e9c2d3741183ce', 'manager', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:25', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:25'); +INSERT INTO `operation_scope_default` VALUES ('f4a01e79e30bd0adcfef3baa3883cef1', 'dept_leader', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:20'); +INSERT INTO `operation_scope_default` VALUES ('f53e80923c35740f1417fd5e6ba67e45', 'grid_party_director', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:53', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:53'); +INSERT INTO `operation_scope_default` VALUES ('f5403e514cf3e29b0c90a74bb2b4daa5', 'grid_member', 'work_partyauth_auditing_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:29', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:29'); +INSERT INTO `operation_scope_default` VALUES ('f5d8fee7ca54f8e74d16f931d4ca0057', 'grid_member', 'work_grassroots_resi_warmhearted_audithistorylist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:07', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:07'); +INSERT INTO `operation_scope_default` VALUES ('f6da660f4e4eadc70417bb65937cea93', 'agency_leader', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:50'); +INSERT INTO `operation_scope_default` VALUES ('f77bc026c4032ed36a10f531725af035', 'grid_party_director', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:22'); +INSERT INTO `operation_scope_default` VALUES ('f875914de9e7e2ae77f51e8252493d32', 'manager', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:33'); +INSERT INTO `operation_scope_default` VALUES ('f89454516debd51ffd47c298c28477b1', 'party_principals', 'work_grassroots_party_member_delete', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:59', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:59'); +INSERT INTO `operation_scope_default` VALUES ('fa1e6ae541742fea7f52439c2afc987d', 'grid_manager', 'work_grassroots_party_member_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:06', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:06'); +INSERT INTO `operation_scope_default` VALUES ('fa527b93295745aa1cdb6276bb066f15', 'manager', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:24', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:24'); +INSERT INTO `operation_scope_default` VALUES ('fac6b7030b3ede7f3d949f8de2581b48', 'grid_manager', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:54'); +INSERT INTO `operation_scope_default` VALUES ('fb7c9febf46f1b08a749f27c469f5741', 'party_principals', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:42', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:42'); +INSERT INTO `operation_scope_default` VALUES ('fb95e1d2c1362dc09f2ab7df699abb52', 'grid_party_director', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:58'); +INSERT INTO `operation_scope_default` VALUES ('fbb751cf3915871b3fb56c0ae900879f', 'grid_manager', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:50'); +INSERT INTO `operation_scope_default` VALUES ('fd860e7b5622eb25fc88c4d9d947d57e', 'grid_member', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:57', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:57'); +INSERT INTO `operation_scope_default` VALUES ('fd90519d2e621648919121136ec5f8eb', 'dept_leader', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:55', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:55'); +INSERT INTO `operation_scope_default` VALUES ('fda313490bc52c593a67014ba33da1f6', 'dept_leader', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:38'); +INSERT INTO `operation_scope_default` VALUES ('fe10275b93d00df0dc3f187b25a979c7', 'agency_leader', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:31'); +INSERT INTO `operation_scope_default` VALUES ('fe8c6180c5f706ef16b6407b417aea25', 'dept_leader', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:09'); +INSERT INTO `operation_scope_default` VALUES ('fea47239eb21e3800ed6b3279f9eba00', 'grid_manager', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:40', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:40'); +INSERT INTO `operation_scope_default` VALUES ('ffb5e0429acb214d697bf5429942f433', 'grid_manager', 'work_grassroots_party_member_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:05', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:05'); +COMMIT; + +-- ---------------------------- +-- Table structure for role_operation +-- ---------------------------- +DROP TABLE IF EXISTS `role_operation`; +CREATE TABLE `role_operation` ( + `ID` varchar(64) NOT NULL, + `ROLE_ID` varchar(64) NOT NULL COMMENT '角色ID', + `OPERATION_KEY` varchar(64) NOT NULL COMMENT '操作key', + `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色能进行那些操作'; + +-- ---------------------------- +-- Table structure for role_operation_default +-- ---------------------------- +DROP TABLE IF EXISTS `role_operation_default`; +CREATE TABLE `role_operation_default` ( + `ID` varchar(64) NOT NULL, + `ROLE_KEY` varchar(64) NOT NULL COMMENT '角色KEY', + `OPERATION_KEY` varchar(64) NOT NULL COMMENT '操作key', + `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色默认的可操作功能列表'; + +-- ---------------------------- +-- Records of role_operation_default +-- ---------------------------- +BEGIN; +INSERT INTO `role_operation_default` VALUES ('0289abd959a0ebf2abce5396468dafe7', 'grid_party_director', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:17', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:17'); +INSERT INTO `role_operation_default` VALUES ('02eb60c8797a4e651503579883788e72', 'grid_party_director', 'work_party_voice_draft_edit', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:50'); +INSERT INTO `role_operation_default` VALUES ('0475f84e613b677688b1431ee326dd1c', 'grid_party_director', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:00', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:00'); +INSERT INTO `role_operation_default` VALUES ('049f7e8fc67032fe1dc028024f8e2484', 'grid_member', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:27'); +INSERT INTO `role_operation_default` VALUES ('0637f74993ba4d1b3a31ca81a1a6f313', 'grid_member', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:04', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:04'); +INSERT INTO `role_operation_default` VALUES ('069a15a004afcc99612d197875ca8d76', 'grid_party_director', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:19'); +INSERT INTO `role_operation_default` VALUES ('06f1b8aca3cf66252a9935b0b53879c2', 'grid_member', 'work_grassroots_group_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:25', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:25'); +INSERT INTO `role_operation_default` VALUES ('070dee52fab9b698e679e95a1cff8d5d', 'grid_manager', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:46', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:46'); +INSERT INTO `role_operation_default` VALUES ('08681d50db47f596868fa17dd488d48a', 'grid_party_director', 'work_grassroots_resi_warmhearted_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:32', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:32'); +INSERT INTO `role_operation_default` VALUES ('116310930b7d8f3133ec80ed6283d9e4', 'agency_leader', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:24', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:24'); +INSERT INTO `role_operation_default` VALUES ('136ef46673e9d750b6a1f0e2e67848db', 'grid_member', 'work_grassroots_resi_warmhearted_audithistorylist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:04', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:04'); +INSERT INTO `role_operation_default` VALUES ('13e0238a8cb33937bb651fe528b16e1b', 'manager', 'org_agency_update', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:33'); +INSERT INTO `role_operation_default` VALUES ('13e20f719d5fac5e201ad927c898d379', 'grid_party_director', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:50'); +INSERT INTO `role_operation_default` VALUES ('1447d113b690ad1a506c7b5a1fe39551', 'manager', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:22'); +INSERT INTO `role_operation_default` VALUES ('14b31b0e3feab83493f66a2feaf1f2be', 'grid_party_director', 'work_partyauth_audithistory', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:32', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:32'); +INSERT INTO `role_operation_default` VALUES ('14cb74bcd79db4c3448862938cf7a5f9', 'grid_party_director', 'work_grassroots_resi_warmhearted_audithistorylist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:22', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:22'); +INSERT INTO `role_operation_default` VALUES ('15159a02df17c662fbcb8b2501d1ed2a', 'grid_party_director', 'work_grassroots_party_member_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:12'); +INSERT INTO `role_operation_default` VALUES ('173dd26aa1b69d033b2747ec1268348f', 'grid_member', 'work_grassroots_party_member_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:29', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:29'); +INSERT INTO `role_operation_default` VALUES ('1cbcc4966ce00e0b56680154968a2af2', 'grid_manager', 'work_partyauth_audited_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('1cc59a2110373ac363d37664475d8d25', 'grid_member', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:10'); +INSERT INTO `role_operation_default` VALUES ('1d3339cb6f82f717dc369b92f6c3016e', 'staff', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:38'); +INSERT INTO `role_operation_default` VALUES ('1f2254af4e68dad4ba5c3d19cbb4a36f', 'party_principals', 'work_party_voice_edit', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:13:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:13:51'); +INSERT INTO `role_operation_default` VALUES ('1fc0e80be3ec5c82faa992fa922823fa', 'party_principals', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:54'); +INSERT INTO `role_operation_default` VALUES ('20e26fb75c3bae4b7ccc83afa47aafdc', 'manager', 'org_department_staff_add', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:56'); +INSERT INTO `role_operation_default` VALUES ('21035a4ddb84d1c4285a24525d01dda6', 'grid_member', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:21', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:21'); +INSERT INTO `role_operation_default` VALUES ('2106bc0e49a6dd926b563a7193005cfa', 'grid_manager', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:51'); +INSERT INTO `role_operation_default` VALUES ('227d1d029f8d52161fe2e71463d2991d', 'grid_manager', 'work_grassroots_party_member_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:03'); +INSERT INTO `role_operation_default` VALUES ('22fe8c877acf26de5f3a862a6fb89674', 'grid_member', 'work_partyauth_audithistory', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:19', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:19'); +INSERT INTO `role_operation_default` VALUES ('231a06771b7d20ed1581dc3955d78389', 'party_principals', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:09'); +INSERT INTO `role_operation_default` VALUES ('254e24cc7ac14ef2b61e3dad52a76189', 'grid_manager', 'work_grassroots_resi_warmhearted_audithistorylist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('254f65d14acab1f197a3e3ec9d93e1dc', 'staff', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:51:00', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:51:00'); +INSERT INTO `role_operation_default` VALUES ('27283afba2049162c32b5a448e720013', 'party_principals', 'work_party_voice_draft_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:56'); +INSERT INTO `role_operation_default` VALUES ('275539f5c14f606c22028b110cd8d474', 'grid_member', 'work_partyauth_auditedlist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:58', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:58'); +INSERT INTO `role_operation_default` VALUES ('2adddd38d06cca9c98c092ba91e7a22b', 'party_principals', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:22:40', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:22:40'); +INSERT INTO `role_operation_default` VALUES ('2c0ea5441d8ba2d2b4cfdff871e49f99', 'dept_leader', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:10'); +INSERT INTO `role_operation_default` VALUES ('2d21da3e0058fe74470967151076a89a', 'party_principals', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:18'); +INSERT INTO `role_operation_default` VALUES ('2f6cb049f67b89e3251a58dc00ea1acf', 'party_principals', 'work_grassroots_party_branch_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:45', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:45'); +INSERT INTO `role_operation_default` VALUES ('2f9945850e2d5236f3c4647f32c30a5e', 'grid_party_director', 'work_party_voice_offline_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:19'); +INSERT INTO `role_operation_default` VALUES ('31c9afb05b07e93177c1222e7fef7bee', 'grid_member', 'work_partyauth_auditing_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:27', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:27'); +INSERT INTO `role_operation_default` VALUES ('3571ccb11e1b2a565ba905f6e6af5940', 'grid_manager', 'work_grassroots_group_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('36aa939fb0602f0ceaa5bdfec098324a', 'manager', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:27'); +INSERT INTO `role_operation_default` VALUES ('375516161db1f9e07a41c2ba3a3dd2ba', 'grid_party_director', 'work_partyauth_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:01'); +INSERT INTO `role_operation_default` VALUES ('37c5fe7ae4c4e7b35bfdfbc7c20e9d35', 'party_principals', 'work_grassroots_issue_shift_project', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:11'); +INSERT INTO `role_operation_default` VALUES ('37fdf7161a4aac9a76cb15fdbc8551e5', 'grid_manager', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:16'); +INSERT INTO `role_operation_default` VALUES ('38294de22b45d00c290488de2a9d4144', 'grid_party_director', 'work_grassroots_party_branch_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:41', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:41'); +INSERT INTO `role_operation_default` VALUES ('385aee084d7a9434cc2cef79749a56e9', 'grid_manager', 'work_grassroots_party_member_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('3b0259bae0e70700f61e4a2e76827c9a', 'agency_leader', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:39'); +INSERT INTO `role_operation_default` VALUES ('3d22b4b7d89f754be4f2e094e50214aa', 'grid_party_director', 'work_party_voice_draft_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:19'); +INSERT INTO `role_operation_default` VALUES ('3e60e284ae798aabd57dfbff176bea67', 'dept_leader', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:32'); +INSERT INTO `role_operation_default` VALUES ('40d0364618cbf4af254e5faf399c15b6', 'grid_manager', 'work_partyauth_audithistory', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('4293834f97fbe2186da31f0009b361ff', 'manager', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:56'); +INSERT INTO `role_operation_default` VALUES ('43111e1fd8a1295447f57c416811c902', 'grid_manager', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:39'); +INSERT INTO `role_operation_default` VALUES ('43527e686db5e44b8064d354fe1b4910', 'agency_leader', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:16'); +INSERT INTO `role_operation_default` VALUES ('438574b4c8136b6cade911c5f8790172', 'grid_member', 'work_grassroots_group_groupsinthegrid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:45'); +INSERT INTO `role_operation_default` VALUES ('463b1b26e8231efb686a0094a737a45c', 'grid_manager', 'work_grassroots_party_branch_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('463cfd33331faf659693237fb9b427a9', 'party_principals', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:23'); +INSERT INTO `role_operation_default` VALUES ('46fc85f884c34fee50357d4670ec0cb8', 'manager', 'org_department_update', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:34'); +INSERT INTO `role_operation_default` VALUES ('4769584f304aa2c913cf4990c1f709a1', 'grid_member', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:54'); +INSERT INTO `role_operation_default` VALUES ('47dbc5dedc953a9c42bbd08a1ea751d5', 'staff', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:40', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:40'); +INSERT INTO `role_operation_default` VALUES ('49ef95b1c5d71ab5970d0447b4432f61', 'grid_party_director', 'work_grassroots_group_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:43', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:43'); +INSERT INTO `role_operation_default` VALUES ('4a359a53602f8f37b8e6505dec2f31fc', 'grid_manager', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:48'); +INSERT INTO `role_operation_default` VALUES ('4bf7893ace8071dd67b07ae9f625219d', 'grid_manager', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:44'); +INSERT INTO `role_operation_default` VALUES ('4c6028019612bc0b111037256d707acb', 'party_principals', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:07'); +INSERT INTO `role_operation_default` VALUES ('4c83b945c5e09938fc8cd9b1ee12c991', 'manager', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:56'); +INSERT INTO `role_operation_default` VALUES ('4cb5c47f6b80b23bb996940cb819e91a', 'manager', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:59', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:59'); +INSERT INTO `role_operation_default` VALUES ('4dca87965fb7cf4c85c803dd1a3e277c', 'grid_party_director', 'work_grassroots_group_audited', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:22', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:22'); +INSERT INTO `role_operation_default` VALUES ('4e722e7346e4a5a63ae4d041ca8a038a', 'dept_leader', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:18'); +INSERT INTO `role_operation_default` VALUES ('4f675edb6edae20444536913c8d90d95', 'agency_leader', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:28'); +INSERT INTO `role_operation_default` VALUES ('4f9409d3f2f8c39849854e6a2b4d9f75', 'grid_member', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:28'); +INSERT INTO `role_operation_default` VALUES ('505742024aad3d92e1833cb6da0d3e1d', 'manager', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:33'); +INSERT INTO `role_operation_default` VALUES ('5255dbfec7e33abe2f534ce5269a85c0', 'grid_member', 'work_partyauth_auditsubmit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:29', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:29'); +INSERT INTO `role_operation_default` VALUES ('539550c5d0564b1aed06ea926d73cb41', 'staff', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:07'); +INSERT INTO `role_operation_default` VALUES ('54dbf69ad528bfd78b8ff43f5b071e3d', 'staff', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:07'); +INSERT INTO `role_operation_default` VALUES ('57fab5120f467e3a9dbd9c750017698b', 'grid_party_director', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:56'); +INSERT INTO `role_operation_default` VALUES ('581c4ccc54ee9b2726c15d63a77b6069', 'manager', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:30', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:30'); +INSERT INTO `role_operation_default` VALUES ('583f568c8288188162ec0c8aa9d75073', 'party_principals', 'work_party_voice_draft_edit', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:09'); +INSERT INTO `role_operation_default` VALUES ('58e710f50d30366c0de847d601fe1e02', 'manager', 'org_department_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:45', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:45'); +INSERT INTO `role_operation_default` VALUES ('58e95771d8fd1335cf03f12193a164a7', 'agency_leader', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:05:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:05:49'); +INSERT INTO `role_operation_default` VALUES ('5af2c8623d516626e9c4fa65c8784a8b', 'grid_member', 'work_grassroots_issue_closed_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:44'); +INSERT INTO `role_operation_default` VALUES ('5cc50eb4730af738cb5cc0d6f062f8b1', 'grid_member', 'work_grassroots_party_branch_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:51', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:51'); +INSERT INTO `role_operation_default` VALUES ('5d80bad76f6176a9fc1bffdcb30c70f7', 'grid_manager', 'work_grassroots_party_branch_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('5eae700ac79621f4192c725b61901f5a', 'grid_manager', 'work_grassroots_resi_warmhearted_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:56', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:56'); +INSERT INTO `role_operation_default` VALUES ('5f2b6f637b756de578d1171e817ba4ff', 'manager', 'org_grid_create', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:07'); +INSERT INTO `role_operation_default` VALUES ('5f69b448af0c45a2521639a2b57ed6cf', 'manager', 'org_grid_staff_remove', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:28'); +INSERT INTO `role_operation_default` VALUES ('6023d87d5739c52841773cad4413028f', 'party_principals', 'work_party_voice_draft_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:57', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:57'); +INSERT INTO `role_operation_default` VALUES ('6039c7f1ea5dee504f73ec78ca1c6ad6', 'dept_leader', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:11'); +INSERT INTO `role_operation_default` VALUES ('6100229547cbe452018fd052f095d231', 'grid_party_director', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:49'); +INSERT INTO `role_operation_default` VALUES ('626076ade70febdef198db0d3293040c', 'grid_member', 'work_grassroots_issue_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:41', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:41'); +INSERT INTO `role_operation_default` VALUES ('62c2f0504db5bef6e1e721c481e78a02', 'grid_party_director', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:47'); +INSERT INTO `role_operation_default` VALUES ('62c76b255a9beb914aabff9e23e37d8c', 'grid_member', 'work_grassroots_resi_warmhearted_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:13', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:13'); +INSERT INTO `role_operation_default` VALUES ('65a4a38883e544b88880ec88b1ce8394', 'grid_member', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:58'); +INSERT INTO `role_operation_default` VALUES ('65d5fec050a882b4cf450c224d095e61', 'manager', 'org_subagency_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:28'); +INSERT INTO `role_operation_default` VALUES ('6809801bab3850d83553a05f5585fd46', 'grid_manager', 'work_grassroots_issue_closed_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('69fbfb2a52cd636c9ef35702ced685e9', 'party_principals', 'work_grassroots_party_member_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:56'); +INSERT INTO `role_operation_default` VALUES ('6a5da2bcfd8e930660c06255b18ddc77', 'grid_member', 'work_grassroots_party_member_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:40', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:40'); +INSERT INTO `role_operation_default` VALUES ('6cd63ec554700a64f2c0c76f0ab93631', 'grid_manager', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:11'); +INSERT INTO `role_operation_default` VALUES ('70899fd06a942784f53b37187a2c85b4', 'grid_member', 'work_partyauth_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:14'); +INSERT INTO `role_operation_default` VALUES ('72cb555761e80a1d2e98f11c2a80fd0b', 'manager', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:46', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:46'); +INSERT INTO `role_operation_default` VALUES ('7480bd87973370d46804639c34bd1436', 'grid_manager', 'work_grassroots_resi_warmhearted_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('777495e37240760fe6f9dd74a8ae3b60', 'staff', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:10'); +INSERT INTO `role_operation_default` VALUES ('7937c47e206fb5bd3910f684f7e22398', 'dept_leader', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:31'); +INSERT INTO `role_operation_default` VALUES ('79465062229f9ff7f6c8f2fed3fc2db9', 'grid_manager', 'work_grassroots_resi_warmhearted_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('79f139b1166c835fe2a5d3f86a846a53', 'manager', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:31'); +INSERT INTO `role_operation_default` VALUES ('7a1bb59a8027c160dea4cde1f9298dd7', 'grid_party_director', 'work_partyauth_auditsubmit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:41', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:41'); +INSERT INTO `role_operation_default` VALUES ('7ab1834eb95c7bf8ac2e7f5a02292d23', 'grid_manager', 'work_grassroots_issue_shifted_project_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('7c47f47e05a5c71a7b8d2f6e4c7ce44b', 'dept_leader', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:06'); +INSERT INTO `role_operation_default` VALUES ('7c8d4f4322e9a481585261994cdcf45e', 'grid_party_director', 'work_partyauth_audithistory_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:06', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:06'); +INSERT INTO `role_operation_default` VALUES ('7d2af7c6593d7f4908aa4f34cd6aa3bf', 'staff', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:12', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:12'); +INSERT INTO `role_operation_default` VALUES ('7d48526135432d768ba65ab77c94fd3c', 'grid_manager', 'work_partyauth_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:52', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:52'); +INSERT INTO `role_operation_default` VALUES ('7e1e513f73b3d7d20824b3b8c6964030', 'manager', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:48'); +INSERT INTO `role_operation_default` VALUES ('7eaf88ad10ba837da4ca000ed4ae485a', 'grid_manager', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:26'); +INSERT INTO `role_operation_default` VALUES ('7ec619cc7f756e755ffe225bef4cfad6', 'grid_manager', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:11'); +INSERT INTO `role_operation_default` VALUES ('8244a19b5ec5997c02f7dd8970e6d5e9', 'agency_leader', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:01:45', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:01:45'); +INSERT INTO `role_operation_default` VALUES ('84414a80fa2658fa7a7fb0e602d4708d', 'grid_party_director', 'work_party_voice_offline', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:26'); +INSERT INTO `role_operation_default` VALUES ('8495710786ffb6d9372f28e61349c5e8', 'grid_party_director', 'work_grassroots_resi_warmhearted_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:06', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:06'); +INSERT INTO `role_operation_default` VALUES ('8554ba31af513654a577a8a245c0877d', 'grid_member', 'work_grassroots_party_member_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:23', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:23'); +INSERT INTO `role_operation_default` VALUES ('856d120f343da93d95ed0812ed1e76a1', 'grid_member', 'work_partyauth_audithistory_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:00', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:00'); +INSERT INTO `role_operation_default` VALUES ('8588b47f86e538c360e0f72e73d68f7c', 'agency_leader', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:46', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:46'); +INSERT INTO `role_operation_default` VALUES ('86e00f87c98af26d64b6a040672799c9', 'grid_manager', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:03'); +INSERT INTO `role_operation_default` VALUES ('874ec6601735a2f3e6a3e94aafe5e4ed', 'grid_member', 'work_grassroots_party_branch_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:03'); +INSERT INTO `role_operation_default` VALUES ('880139add57f9835418bd09d59a6f969', 'grid_member', 'work_grassroots_group_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:35'); +INSERT INTO `role_operation_default` VALUES ('894fbbea0d0e9a6c5d61bce1abb58699', 'grid_member', 'work_grassroots_issue_shift_project', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:39', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:39'); +INSERT INTO `role_operation_default` VALUES ('8a158026cc022b0100ce56fb23e41876', 'grid_party_director', 'work_grassroots_issue_shifted_project_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:10', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:10'); +INSERT INTO `role_operation_default` VALUES ('8a2e0a8225dc52932f1d5b44e50db6c5', 'grid_member', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:58'); +INSERT INTO `role_operation_default` VALUES ('8b4277e7fbef3486fe6a17532834a1c9', 'dept_leader', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:50'); +INSERT INTO `role_operation_default` VALUES ('8b5e7d3ce6567d4c4159f79a9ed05ec8', 'grid_member', 'work_grassroots_issue_close', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:52', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:52'); +INSERT INTO `role_operation_default` VALUES ('8c2815fd2fef18af685c80f1cd891631', 'party_principals', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:29', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:29'); +INSERT INTO `role_operation_default` VALUES ('8c92f231577a9fbe2453c9287adb1832', 'grid_party_director', 'work_party_voice_draft_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:07'); +INSERT INTO `role_operation_default` VALUES ('8f0025cb10698087121d8c78940050a0', 'manager', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:02', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:02'); +INSERT INTO `role_operation_default` VALUES ('8fc3764cf57c8d7b41cf196d7502b528', 'grid_member', 'work_grassroots_resi_warmhearted_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:54', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:54'); +INSERT INTO `role_operation_default` VALUES ('8fdbff8b62b89a76aaa2f9357c5a4125', 'grid_party_director', 'work_party_voice_publish', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:16:53', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:16:53'); +INSERT INTO `role_operation_default` VALUES ('908fa32614b6d620bf9d90938642767d', 'grid_manager', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:37', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:37'); +INSERT INTO `role_operation_default` VALUES ('921ed32bf78c233030d11daaf1777846', 'grid_party_director', 'work_party_voice_edit', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:09'); +INSERT INTO `role_operation_default` VALUES ('9233d75ed19bb91296efe0eb4a289d2d', 'dept_leader', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:34'); +INSERT INTO `role_operation_default` VALUES ('92f2fda334c4f3263740413a41739d01', 'dept_leader', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:58'); +INSERT INTO `role_operation_default` VALUES ('939fbd0f2f6f292777b48fd4820bcfa1', 'party_principals', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:44'); +INSERT INTO `role_operation_default` VALUES ('98855ddd12c2bd2533b66f6c74b4169d', 'staff', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:20'); +INSERT INTO `role_operation_default` VALUES ('993f20fef7ef4ddd9b740cd38337d2a9', 'grid_member', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:54'); +INSERT INTO `role_operation_default` VALUES ('9949060f474b7ad59464d5078349de54', 'agency_leader', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:26:17', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:26:17'); +INSERT INTO `role_operation_default` VALUES ('9ac9c70a52c3947977f4d2ea00544aaf', 'agency_leader', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:22'); +INSERT INTO `role_operation_default` VALUES ('9c320477f830971b20de4fd2c6e0df44', 'party_principals', 'work_party_voice_offline', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:14', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:14'); +INSERT INTO `role_operation_default` VALUES ('9cd3bec9bca3475195363d8bfacdad89', 'grid_manager', 'work_partyauth_auditing_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('9d76641c3ea32be45805df59eb583e5d', 'grid_member', 'work_grassroots_party_branch_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:12'); +INSERT INTO `role_operation_default` VALUES ('9df215b3633c82f506a9cdd343e85052', 'dept_leader', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:39'); +INSERT INTO `role_operation_default` VALUES ('9ea7ca2c1471cd0ed0b0c934a5379d1d', 'grid_manager', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:35'); +INSERT INTO `role_operation_default` VALUES ('9f2c651644e6419ed8f257625f286c11', 'grid_member', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:54:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:54:06'); +INSERT INTO `role_operation_default` VALUES ('9f5cc3348750c6b120ef91e9140fd855', 'grid_party_director', 'work_grassroots_issue_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:58', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:58'); +INSERT INTO `role_operation_default` VALUES ('9f9a78cf71ac9255544f917dc73ce7d9', 'grid_member', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:58'); +INSERT INTO `role_operation_default` VALUES ('a04ac689a00d143f50bac24515c1307e', 'grid_party_director', 'work_grassroots_group_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:42', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:42'); +INSERT INTO `role_operation_default` VALUES ('a236bbc05d81165d56bf6d6b316704e0', 'dept_leader', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:51'); +INSERT INTO `role_operation_default` VALUES ('a2878a38ff52c861993553dc3ecb8b5b', 'grid_member', 'work_grassroots_issue_voting_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:40', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:40'); +INSERT INTO `role_operation_default` VALUES ('a28b8cf3eb4b7a7aed505c2befa52de4', 'party_principals', 'work_party_voice_publish', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:16:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:16:09'); +INSERT INTO `role_operation_default` VALUES ('a3cb9fcb7857dfc1c82b2e74f590aeb7', 'grid_party_director', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:55', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:55'); +INSERT INTO `role_operation_default` VALUES ('a51c3b1d734211a05e4078d47a9e3e95', 'grid_party_director', 'work_grassroots_group_groupsinthegrid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:03'); +INSERT INTO `role_operation_default` VALUES ('a547fbfb08aad3a3a99ccc6804de2b7e', 'grid_party_director', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:39'); +INSERT INTO `role_operation_default` VALUES ('a7e669209facf696931d19b312054d8c', 'manager', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:32'); +INSERT INTO `role_operation_default` VALUES ('adc46a20f1fbde1dbb04aa32e66f0770', 'grid_manager', 'work_partyauth_audithistory_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('b086c55b97d263fa275277a6579351a6', 'manager', 'org_grid_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:34'); +INSERT INTO `role_operation_default` VALUES ('b28b390ff05c120c33ba2898516e263d', 'grid_manager', 'work_partyauth_auditsubmit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('b290267e0d4f69fc9e90bfdb2a66c15d', 'grid_party_director', 'work_grassroots_party_branch_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:17', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:17'); +INSERT INTO `role_operation_default` VALUES ('b3ff03df3cf64661fcb7e889830a85e9', 'grid_manager', 'work_grassroots_issue_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('b6c249ce80d266330556e3e9463730b6', 'grid_manager', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:15', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:15'); +INSERT INTO `role_operation_default` VALUES ('b7b35eff5a8e9e977cdf979ae609fe48', 'staff', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:47'); +INSERT INTO `role_operation_default` VALUES ('b8356312c6999e7991f02ba7a36ccd68', 'manager', 'org_grid_update', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:21', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:21'); +INSERT INTO `role_operation_default` VALUES ('bb3f3874830982698791478ef82cf233', 'manager', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:28'); +INSERT INTO `role_operation_default` VALUES ('be06dcc0739db05e60f4c7645f209113', 'grid_member', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:18'); +INSERT INTO `role_operation_default` VALUES ('be65b3e97f6e7ec14324cd21a4650209', 'grid_party_director', 'work_grassroots_group_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:52', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:52'); +INSERT INTO `role_operation_default` VALUES ('bebe06a5a9e581b84b7a7fb65c711927', 'staff', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:36', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:36'); +INSERT INTO `role_operation_default` VALUES ('c018464eeb15d7f83ff65043c229cdc2', 'grid_party_director', 'work_grassroots_issue_closed_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:01'); +INSERT INTO `role_operation_default` VALUES ('c1b2515e5c37068a963c503bdfb2b9dd', 'grid_manager', 'work_grassroots_group_groupsinthegrid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('c3d37d36c58e5a729b640ada67f609a6', 'manager', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:45', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:45'); +INSERT INTO `role_operation_default` VALUES ('c4edf32b0b7a2f7eaaf224d7b6e4ac49', 'party_principals', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:44'); +INSERT INTO `role_operation_default` VALUES ('c5526dbf71b708a57e7d8a31be66fdf5', 'grid_party_director', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:01'); +INSERT INTO `role_operation_default` VALUES ('c6617e17d269b96ea2e01a0c290d5f54', 'grid_party_director', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:22'); +INSERT INTO `role_operation_default` VALUES ('c68db11617923bc6c7e30948aaebcc47', 'agency_leader', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:11'); +INSERT INTO `role_operation_default` VALUES ('c693cf1da62b18e85660a453f0225f47', 'grid_manager', 'work_grassroots_party_branch_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:26', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:26'); +INSERT INTO `role_operation_default` VALUES ('c7083159775af83627fa413b11df6902', 'party_principals', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:13'); +INSERT INTO `role_operation_default` VALUES ('c74f706ab5aa54a1e9f6059aeed6724b', 'dept_leader', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:33'); +INSERT INTO `role_operation_default` VALUES ('c7c308280a8a46f82bc27527095c7d0e', 'grid_party_director', 'work_partyauth_auditedlist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:50', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:50'); +INSERT INTO `role_operation_default` VALUES ('c89576a8ab0f7fd9602a0e3071c1505c', 'grid_party_director', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:50'); +INSERT INTO `role_operation_default` VALUES ('c8acf604e97386f8bf2246c051039e7b', 'dept_leader', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:20'); +INSERT INTO `role_operation_default` VALUES ('c9af4b9ef83ee6d1f638f1b1a9c7f138', 'dept_leader', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:18'); +INSERT INTO `role_operation_default` VALUES ('c9f97b4c7c98cae78317680d4480ea9b', 'party_principals', 'work_grassroots_resi_warmhearted_apply_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:22'); +INSERT INTO `role_operation_default` VALUES ('cb0f3a113191dd1f27a78b249283b57f', 'grid_member', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:21', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:21'); +INSERT INTO `role_operation_default` VALUES ('cb130ffc188c570f3aed8e16718d61e4', 'grid_member', 'work_grassroots_group_audited', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:15', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:15'); +INSERT INTO `role_operation_default` VALUES ('cb34dff328e0b770e293ef687d4332bd', 'agency_leader', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:01'); +INSERT INTO `role_operation_default` VALUES ('cc3c62876c3cfa124b73d531f668dc26', 'agency_leader', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:01'); +INSERT INTO `role_operation_default` VALUES ('ccf7dac4341e0a7220c8e9cb78a6a018', 'grid_party_director', 'work_grassroots_party_member_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:50', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:50'); +INSERT INTO `role_operation_default` VALUES ('cd91b28d573a7b2db5e7daf85a6f78f5', 'grid_manager', 'work_grassroots_party_member_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('d0cecb47cf834f4cfdd7bf14f49a2b6b', 'manager', 'org_staff_create', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:19'); +INSERT INTO `role_operation_default` VALUES ('d1595a49377fe11476129c3e7bd20746', 'grid_manager', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:07'); +INSERT INTO `role_operation_default` VALUES ('d26e14c97ded69847366c4ffbc1de009', 'staff', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:35'); +INSERT INTO `role_operation_default` VALUES ('d5201099c5d29f6f9083899626b731a4', 'party_principals', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:36', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:36'); +INSERT INTO `role_operation_default` VALUES ('d641ca48eb1460f2de9697ea0ff72fb5', 'party_principals', 'work_party_voice_offline_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:05', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:05'); +INSERT INTO `role_operation_default` VALUES ('d6a055d97ad1b4c137bd4640bc516183', 'manager', 'org_staff_update', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:39'); +INSERT INTO `role_operation_default` VALUES ('d6e029e17b0a6902fd6e1806b1d89db5', 'grid_manager', 'work_grassroots_group_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('d8195479b23cc54b7e17a50e8e8e84f5', 'grid_manager', 'work_grassroots_issue_shift_project', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:07', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:07'); +INSERT INTO `role_operation_default` VALUES ('d8a782b328b46d709ab2b21b1e847611', 'grid_party_director', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:30', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:30'); +INSERT INTO `role_operation_default` VALUES ('d93782eddebb094124e07f726b7fa28f', 'grid_manager', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:22'); +INSERT INTO `role_operation_default` VALUES ('da68d76c5d43dd5d9e2fbf96cdaa0877', 'party_principals', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:03'); +INSERT INTO `role_operation_default` VALUES ('ddf7f6f79435d0b764fbd861047f256f', 'grid_party_director', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:27'); +INSERT INTO `role_operation_default` VALUES ('de6ff59aeb85ef82f34886db86a38140', 'grid_party_director', 'work_partyauth_auditing_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:31'); +INSERT INTO `role_operation_default` VALUES ('e07fdaab4762fe38346bc1144e56dc83', 'manager', 'org_staff_forbidden', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:49'); +INSERT INTO `role_operation_default` VALUES ('e0c599352c9ab1b2e9943f2d39e963ee', 'grid_party_director', 'work_grassroots_party_member_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:53', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:53'); +INSERT INTO `role_operation_default` VALUES ('e10cb46de3cc3acaaea9415328e18c58', 'manager', 'org_department_create', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:23'); +INSERT INTO `role_operation_default` VALUES ('e14fd6aebcf8a1baa14c70d522082894', 'agency_leader', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:04', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:04'); +INSERT INTO `role_operation_default` VALUES ('e3e8348ffe1d3e77189bc80e96b031b7', 'grid_party_director', 'work_grassroots_issue_voting_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:55', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:55'); +INSERT INTO `role_operation_default` VALUES ('e5fabe6f2620a44c1fdd23cd39e6cd18', 'grid_party_director', 'work_grassroots_party_branch_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:22', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:22'); +INSERT INTO `role_operation_default` VALUES ('e64f692b01171357475a543e524fa289', 'staff', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:34'); +INSERT INTO `role_operation_default` VALUES ('e77b03c4f895c29b0c3c5e43db410165', 'grid_party_director', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:13'); +INSERT INTO `role_operation_default` VALUES ('e7da06cf70973dde748efe7eca8b3742', 'dept_leader', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:09'); +INSERT INTO `role_operation_default` VALUES ('ea2dc4e8c769103ef80944fd0903614c', 'manager', 'org_subagency_create', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:46', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:46'); +INSERT INTO `role_operation_default` VALUES ('eb0044f7b0d9be2ed9f7ad44c4b5dab6', 'grid_member', 'work_grassroots_group_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:23', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:23'); +INSERT INTO `role_operation_default` VALUES ('eb394273fcc4d7cf5975bbbf89309845', 'agency_leader', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:11'); +INSERT INTO `role_operation_default` VALUES ('ec0659b748c56bf3167aae20d2bd7752', 'grid_party_director', 'work_grassroots_issue_shift_project', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:14'); +INSERT INTO `role_operation_default` VALUES ('ed69d70798bbacf9a8f5299397694793', 'agency_leader', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:44'); +INSERT INTO `role_operation_default` VALUES ('ed9216aa608eeec22377526dfd0f4fc3', 'staff', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:03'); +INSERT INTO `role_operation_default` VALUES ('ee4043b879abaf0998acbc05eeaabe0e', 'grid_party_director', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:20'); +INSERT INTO `role_operation_default` VALUES ('f03909c46a72eba529d18b138f5dc8e4', 'party_principals', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:20'); +INSERT INTO `role_operation_default` VALUES ('f0d8aaaaedeaeceff0e5d1f1bb4be799', 'manager', 'org_department_staff_remove', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:17:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:17:06'); +INSERT INTO `role_operation_default` VALUES ('f1e8123660f43c8160b1ac90784d33f1', 'grid_party_director', 'work_grassroots_issue_close', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:07', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:07'); +INSERT INTO `role_operation_default` VALUES ('f221dd183e1dd400b1c20217208159b9', 'grid_member', 'work_grassroots_resi_warmhearted_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:13', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:13'); +INSERT INTO `role_operation_default` VALUES ('f2574066107e80d9f6c5043aef7a4838', 'grid_member', 'work_partyauth_audited_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:12'); +INSERT INTO `role_operation_default` VALUES ('f2b3c56a87050aaf87064a1c4d269e09', 'party_principals', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:20'); +INSERT INTO `role_operation_default` VALUES ('f2fe0911fc733229a9fd5c514cc88f26', 'manager', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:16'); +INSERT INTO `role_operation_default` VALUES ('f427cfe35a55d84fafc9ebbf05b0b8bd', 'grid_manager', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:43', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:43'); +INSERT INTO `role_operation_default` VALUES ('f4b7ed10e0d4e1bef2eae1f7e4baf4bb', 'grid_member', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:38'); +INSERT INTO `role_operation_default` VALUES ('f5bce61b3b07e26a1d7b8ef02844fb34', 'staff', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:32'); +INSERT INTO `role_operation_default` VALUES ('f5c78ed47ef53580fd783628491af975', 'grid_member', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:32'); +INSERT INTO `role_operation_default` VALUES ('f6480fdf44c2d010dbc6a6faab5bd575', 'grid_member', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:48'); +INSERT INTO `role_operation_default` VALUES ('f6648b257d13b62e56408b0c668bf4c2', 'grid_manager', 'work_grassroots_group_audited', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('f711e697eb2f0af7b10d9fc20195a828', 'staff', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:54'); +INSERT INTO `role_operation_default` VALUES ('f7798e2175a08a997ffca8b7f10160de', 'grid_manager', 'work_grassroots_issue_close', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('f797a4f94763b660efec7c01cb687e0e', 'grid_member', 'work_grassroots_issue_shifted_project_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:05', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:05'); +INSERT INTO `role_operation_default` VALUES ('fa2e600ecbe4348b2aad206e17561af5', 'manager', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:20'); +INSERT INTO `role_operation_default` VALUES ('fa90970dd78fb518641287561b9f2156', 'dept_leader', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:01'); +INSERT INTO `role_operation_default` VALUES ('faf2ddb2c1ddfbf389d2a7941ee302ed', 'agency_leader', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:44'); +INSERT INTO `role_operation_default` VALUES ('fb05ac044d5192537b9896ce24f3b37c', 'grid_manager', 'work_grassroots_group_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('fb100a6c54ca542a75e38519c5670143', 'grid_manager', 'work_grassroots_issue_voting_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); +INSERT INTO `role_operation_default` VALUES ('fce3813353120d17ba9fddcf40088e71', 'manager', 'org_grid_staff_add', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:14', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:14'); +INSERT INTO `role_operation_default` VALUES ('feafa26b7a539a214ba7375fec6d9d94', 'manager', 'org_department_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:19:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:19:47'); +INSERT INTO `role_operation_default` VALUES ('fec09cf7b821f0d4ee1c46777b75f306', 'party_principals', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:25', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:25'); +INSERT INTO `role_operation_default` VALUES ('ff0230c8252b370d1ba258b8dbde615d', 'grid_manager', 'work_partyauth_auditedlist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:26', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:26'); +INSERT INTO `role_operation_default` VALUES ('ff92545c692a0fb90f5ec4d38a5ad7e0', 'grid_party_director', 'work_partyauth_audited_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:32', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:32'); +INSERT INTO `role_operation_default` VALUES ('ff9ac6495fb0bf283bc8a4a5ed9ff7b6', 'staff', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:34'); +INSERT INTO `role_operation_default` VALUES ('ffd9c0ce95c74464b94ec88ede0aa6e1', 'grid_party_director', 'work_grassroots_resi_warmhearted_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:12'); +COMMIT; + +-- ---------------------------- +-- Table structure for role_scope +-- ---------------------------- +DROP TABLE IF EXISTS `role_scope`; +CREATE TABLE `role_scope` ( + `ID` varchar(64) NOT NULL, + `ROLE_ID` varchar(64) NOT NULL COMMENT '角色ID', + `OPERATION_KEY` varchar(64) NOT NULL COMMENT '操作key', + `SCOPE_KEY` varchar(30) NOT NULL COMMENT '范围Key', + `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色能操作哪些范围'; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql deleted file mode 100644 index ecd68455d3..0000000000 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V2__DemoSql.sql +++ /dev/null @@ -1,4 +0,0 @@ --- CREATE TABLE epmet_gov_access.device_t ( --- device_id bigint(11) primary KEY auto_increment, --- device_name varchar(20) NOT NULL --- ) \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/epmet_gov_access.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/epmet_gov_access.sql deleted file mode 100644 index 9f2eec699a..0000000000 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/epmet_gov_access.sql +++ /dev/null @@ -1,119 +0,0 @@ -/* - Date: 22/04/2020 12:13:38 -*/ - --- SET NAMES utf8mb4; --- #SET FOREIGN_KEY_CHECKS = 0; - -CREATE DATABASE `epmet_gov_access` DEFAULT CHARACTER SET utf8mb4; - --- DROP TABLE IF EXISTS `permission_scope`; -CREATE TABLE `operation_scope` ( - `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'id', - `SCOPE_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '范围key', - `SCOPE_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '范围名称', - `SCOPE_INDEX` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '范围序号', - `DEL_FLAG` tinyint(1) NULL DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', - `REVISION` int(10) NULL DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者id', - `CREATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者id', - `UPDATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限范围表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for resource_ope --- ---------------------------- --- DROP TABLE IF EXISTS `operation`; -CREATE TABLE `operation` ( - `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `OPERATION_KEY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `OPERATION_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `BRIEF` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作简介', - `DEL_FLAG` tinyint(1) NULL DEFAULT NULL, - `REVISION` int(10) NULL DEFAULT NULL, - `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `CREATED_TIME` datetime(0) NULL DEFAULT NULL, - `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `UPDATED_TIME` datetime(0) NULL DEFAULT NULL, - PRIMARY KEY (`ID`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '操作类型表' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for role_operation --- ---------------------------- --- DROP TABLE IF EXISTS `role_operation`; -CREATE TABLE `role_operation` ( - `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `ROLE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色ID', - `OPERATION_KEY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作key', - `DEL_FLAG` tinyint(1) NULL DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', - `REVISION` int(10) NULL DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者id', - `CREATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者id', - `UPDATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色能进行那些操作' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Table structure for role_scope --- ---------------------------- --- DROP TABLE IF EXISTS `role_scope`; -CREATE TABLE `role_scope` ( - `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, - `ROLE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '角色ID', - `OPERATION_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作Key', - `SCOPE_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '范围Key', - `DEL_FLAG` tinyint(1) NULL DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', - `REVISION` int(10) NULL DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '创建者id', - `CREATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '更新者id', - `UPDATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '角色能操作哪些范围' ROW_FORMAT = Dynamic; - --- SET FOREIGN_KEY_CHECKS = 1; - --- 2020.04.29 wxz -CREATE TABLE `access_setting` ( - `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', - `ROLE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '角色ID', - `OPERATION_KEY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作key', - `SETTING_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置KEY', - `SETTING_VALUE` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置值', - `DEL_FLAG` tinyint(1) NULL DEFAULT NULL, - `REVISION` int(10) NULL DEFAULT NULL, - `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `CREATED_TIME` datetime(0) NULL DEFAULT NULL, - `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `UPDATED_TIME` datetime(0) NULL DEFAULT NULL, - PRIMARY KEY (`ID`) USING BTREE, - UNIQUE INDEX `uni_access_setting_role_key_opt`(`ROLE_ID`, `OPERATION_KEY`, `SETTING_KEY`) USING BTREE -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限配置' ROW_FORMAT = Dynamic; - - -CREATE TABLE `access_setting_options` ( - `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键', - `SETTING_KEY` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置KEY', - `SETTING_NAME` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '配置name', - `BRIEF` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '简介', - `DEL_FLAG` tinyint(1) NULL DEFAULT NULL, - `REVISION` int(10) NULL DEFAULT NULL, - `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `CREATED_TIME` datetime(0) NULL DEFAULT NULL, - `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, - `UPDATED_TIME` datetime(0) NULL DEFAULT NULL, - PRIMARY KEY (`ID`) USING BTREE, - UNIQUE INDEX `uni_access_setting_opts`(`SETTING_KEY`) USING BTREE COMMENT '配置KEY不能重复' -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '权限配置选项' ROW_FORMAT = Dynamic; - --- ---------------------------- --- Records of access_setting_options --- ---------------------------- -INSERT INTO `access_setting_options` VALUES ('1', 'I_CREATED', '我发起的', '我发起的条件过滤。ON为开启，OFF为关闭', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO `access_setting_options` VALUES ('2', 'I_PART', '我参与的', '我参与的条件过滤', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO `access_setting_options` VALUES ('3', 'IN_GRID', '网格内', '网格内', 0, 0, NULL, NULL, NULL, NULL); -INSERT INTO `access_setting_options` VALUES ('4', 'IN_DEPARTMENT', '部门内', '部门内', 0, 0, NULL, NULL, NULL, NULL); From 39149f4181bd33cc743006af3e895d1cd288b4e6 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 Jun 2020 13:03:53 +0800 Subject: [PATCH 10/34] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-access/gov-access-server/deploy/docker-compose-dev.yml | 2 +- .../gov-access/gov-access-server/deploy/docker-compose-test.yml | 2 +- epmet-module/gov-access/gov-access-server/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml index 8780612264..c7aa5c3681 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.32 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.33 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml index 1d19b6beac..74eb00eeed 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.29 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.33 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index 93a1bd00f9..e7d702aac5 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.32 + 0.3.33 gov-access com.epmet From bacf1250d7461b008e06fffb390c6068ca05b9af Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 13:30:03 +0800 Subject: [PATCH 11/34] =?UTF-8?q?=E4=BD=93=E9=AA=8C=E7=89=88=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=EF=BC=9Agateway=E3=80=81user=E3=80=81auth=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E5=B1=85=E6=B0=91=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?appId,appSecret?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-test.yml | 2 +- epmet-gateway/deploy/docker-compose-test.yml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml index 8eef96eca6..e177ec9944 100644 --- a/epmet-auth/deploy/docker-compose-test.yml +++ b/epmet-auth/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.20 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.21 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-gateway/deploy/docker-compose-test.yml b/epmet-gateway/deploy/docker-compose-test.yml index 6942b0abb9..9ceffc1c63 100644 --- a/epmet-gateway/deploy/docker-compose-test.yml +++ b/epmet-gateway/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.17 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-gateway:0.3.18 ports: - "8080:8080" network_mode: host # 使用现有网络 diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml index 5c9f3966ff..accb7bf5f3 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-test.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.59 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-server:0.3.60 ports: - "8087:8087" network_mode: host # 不会创建新的网络 From efaabf0b02c04505f326f96b9eefd25779ea4d32 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 23 Jun 2020 13:55:21 +0800 Subject: [PATCH 12/34] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/docker-compose-dev.yml | 2 +- .../deploy/docker-compose-test.yml | 2 +- .../epmet-message-server/pom.xml | 2 +- .../resources/db/migration/V0.3.12.1__DDL.sql | 6 +- .../resources/db/migration/V0.3.12.2__DML.sql | 2 - .../deploy/docker-compose-dev.yml | 2 +- .../deploy/docker-compose-test.yml | 2 +- .../gov-access/gov-access-server/pom.xml | 2 +- .../resources/db/migration/V0.0.1__init.sql | 717 +----------------- .../deploy/docker-compose-dev.yml | 2 +- .../deploy/docker-compose-test.yml | 2 +- .../gov-voice/gov-voice-server/pom.xml | 2 +- .../db/migration/V0.0.2__add_gridIds.sql | 3 - .../deploy/docker-compose-dev.yml | 2 +- .../deploy/docker-compose-test.yml | 2 +- .../resi-partymember-server/pom.xml | 2 +- .../db/migration/V0.0.2__partybranch.sql | 31 - 17 files changed, 14 insertions(+), 769 deletions(-) delete mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__DML.sql delete mode 100644 epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__add_gridIds.sql delete mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index c54e0d1d6c..5b43fe23c5 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.18 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.19 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml index c3f64d1553..104ba801e6 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.18 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.19 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index eec5a6951a..481ab4f529 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.18 + 0.3.19 com.epmet epmet-message diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.1__DDL.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.1__DDL.sql index 924dc9256e..7a51a3f595 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.1__DDL.sql +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.1__DDL.sql @@ -1,5 +1 @@ -CREATE TABLE `demo_t` ( - `device_id` bigint(11) NOT NULL AUTO_INCREMENT, - `device_name` varchar(20) NOT NULL, - PRIMARY KEY (`device_id`) -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4; \ No newline at end of file +select 0; \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__DML.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__DML.sql deleted file mode 100644 index eabf69bf99..0000000000 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.12.2__DML.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT INTO demo_t (device_name) VALUES ('a'); -INSERT INTO demo_t (device_name) VALUES ('b'); \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml index c7aa5c3681..e037bc1878 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.33 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-access-server:0.3.34 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml index 74eb00eeed..fa2fe5a092 100644 --- a/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-access/gov-access-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-access-server: container_name: gov-access-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.33 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-access-server:0.3.34 ports: - "8099:8099" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-access/gov-access-server/pom.xml b/epmet-module/gov-access/gov-access-server/pom.xml index e7d702aac5..a70f4f33f0 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.33 + 0.3.34 gov-access com.epmet diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.1__init.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.1__init.sql index 92aa71ac69..7a51a3f595 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.1__init.sql +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.1__init.sql @@ -1,716 +1 @@ -/* - Navicat Premium Data Transfer - - Source Server : mini - Source Server Type : MySQL - Source Server Version : 50728 - Source Host : 192.168.1.130:3306 - Source Schema : epmet_gov_access - - Target Server Type : MySQL - Target Server Version : 50728 - File Encoding : 65001 - - Date: 23/06/2020 12:50:28 -*/ - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for operation --- ---------------------------- -DROP TABLE IF EXISTS `operation`; -CREATE TABLE `operation` ( - `ID` varchar(64) NOT NULL, - `OPERATION_KEY` varchar(64) NOT NULL, - `OPERATION_NAME` varchar(64) DEFAULT NULL, - `BRIEF` varchar(255) DEFAULT NULL COMMENT '操作简介', - `DEL_FLAG` tinyint(1) DEFAULT NULL, - `REVISION` int(10) DEFAULT NULL, - `CREATED_BY` varchar(64) DEFAULT NULL, - `CREATED_TIME` datetime DEFAULT NULL, - `UPDATED_BY` varchar(64) DEFAULT NULL, - `UPDATED_TIME` datetime DEFAULT NULL, - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='操作类型表'; - --- ---------------------------- --- Records of operation --- ---------------------------- -BEGIN; -INSERT INTO `operation` VALUES ('035c19d96fc84456dd124ff1ca4c0eec', 'work_party_voice_edit', '党建声音:重新编辑', '', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); -INSERT INTO `operation` VALUES ('0511c52b0038893ac5ec7f855fd9eed0', 'work_party_voice_draft_delete', '党建声音:删除草稿', '删除草稿', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); -INSERT INTO `operation` VALUES ('08ddfdafec1f4baec02b807442936e1d', 'work_party_voice_publish', '党建声音:创建文章', '', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); -INSERT INTO `operation` VALUES ('0a311ae36071cd4b5a1fb6dd6df7d0ee', 'work_grassroots_party_branch_delete', '删除党支部', '支部管理-删除党支部', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); -INSERT INTO `operation` VALUES ('0d37e490e1a9e0e009aab000cc8f08d6', 'work_grassroots_party_member_delete', '删除党员', '支部管理-删除党员', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); -INSERT INTO `operation` VALUES ('1', 'org_staff_detail', '组织-工作人员-详情', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('17728bb2c1130ccda89b6fbd62652882', 'work_party_voice_offline', '党建声音:下线文章', '', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); -INSERT INTO `operation` VALUES ('1ecdb8e0febbd31cf6aae2ec69dcfb24', 'work_grassroots_issue_shift_project', '转项目', '转项目（选择处理部门api也需要添加此校验）', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('2', 'org_staff_list', '组织-工作人员-列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('224978fdf860a5792ed9b584e9b6218b', 'work_party_voice_detail', '党建声音:文章详情', '已发布详情、已下线详情', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); -INSERT INTO `operation` VALUES ('271e950dc966c821cf2896ce1258e53a', 'work_grassroots_resi_warmhearted_apply_detail', '基层治理:居民管理:热心居民申请详情', '基层治理:居民管理:查看热心居民申请详情', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('29c03074-8933-11ea-8bc0-c03fd56f7847', 'work_partyauth_auditinglist', '工作-党员认证-带审核列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('29cb91dd-8933-11ea-8bc0-c03fd56f7847', 'work_partyauth_auditedlist', '工作-党员认证-已认证列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('29d5c419-8933-11ea-8bc0-c03fd56f7847', 'work_partyauth_audithistory', '工作-党员认证-审核历史', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('29e82fa9-8933-11ea-8bc0-c03fd56f7847', 'work_partyauth_auditsubmit', '工作-党员认证-审核', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('2b6ed5299d1bab807be2ded38dcb1031', 'work_grassroots_party_member_edit', '编辑党员', '支部管理-编辑党员', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); -INSERT INTO `operation` VALUES ('3', 'org_staff_create', '组织-工作人员-新增', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('30ad909236bfc1a25e81a2c464b9f4a9', 'work_partyauth_audithistory_detail', '基层治理:党员认证:审核历史详情', '基层治理:党员认证:查看审核历史详情（自动审核失败、拒绝的）', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('3299cabaea5dbe4ef86cbd730331e950', 'work_project_trace_detail', '项目详情', '项目详情界面所有的api添加此校验', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('3c7e00fc7b6e25264ff623cd2c7134b0', 'work_grassroots_party_branch_edit', '编辑党支部', '支部管理-编辑党支部信息', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); -INSERT INTO `operation` VALUES ('3ccbf741b3236d37f4bf21084cb217c6', 'work_grassroots_group_apply_detail', '基层治理:群组管理:建组申请', '基层治理:群组管理:建组申请详情', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('455f472ab1bf5991dbafa692dc5b8c82', 'work_project_trace_transfer', '转其他部门', '转其他部门（选择处理部门api也需要添加此校验）', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('49813219e9a7d121854c4e7bb2403ddd', 'work_party_voice_draft_list', '党建声音:草稿箱列表', '草稿箱列表', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); -INSERT INTO `operation` VALUES ('53f4e5993d6581612543d78bc45eb95e', 'work_party_voice_published_list', '党建声音:已发布列表', '已发布文章列表查询', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); -INSERT INTO `operation` VALUES ('620c61520cec627300b3c2d98d142adc', 'work_party_voice_operation_list', '党建声音:查看文章操作记录', '', 0, 0, 'APP_USER', '2020-06-08 19:56:40', 'APP_USER', '2020-06-08 19:56:40'); -INSERT INTO `operation` VALUES ('63bba3a28258892714a820c47730534d', 'work_project_trace_close', '结案', '结案', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('721f616a0756a5120a78fda70fdeb025', 'work_grassroots_issue_voting_list', '表决中列', '表决中议题列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('7a9f1d15f5764bea3f5021de133420ee', 'work_grassroots_issue_close', '关闭议题', '关闭议题', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('88c4d9576bb17814ba798b7f8df30ada', 'work_party_voice_offline_list', '党建声音:已下线列表', '已下线文章列表', 0, 0, 'APP_USER', '2020-06-02 13:50:23', 'APP_USER', '2020-06-02 13:50:23'); -INSERT INTO `operation` VALUES ('8cec055f4e03b7f44550d355ae4f8b60', 'work_grassroots_party_branch_add', '添加党支部', '支部管理-添加党支部', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); -INSERT INTO `operation` VALUES ('969a3e3c9b02743c49a435ca04b3845c', 'work_project_trace_involved_list', '我参与', '我参与的项目，列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('989946d1fce408dc35cdf978300bdce3', 'work_project_trace_return', '退回', '退回', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('a7979efa3624bff09f87bb640017feb2', 'work_partyauth_audited_detail', '基层治理:党员认证:已认证详情', '基层治理:党员认证:查看已认证党员详情', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('bce584d3-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_group_auditinglist', '基层治理-群组管理-待审核列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bcf370b2-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_group_audit', '基层治理-群组管理-审核建组', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd05028c-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_group_groupsinthegrid', '基层治理-群组管理-本网格小组列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd12fec2-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_resi_warmhearted_auditinglist', '基层治理-居民管理-热心居民待审核列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd29a0c1-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_resi_warmhearted_audithistorylist', '基层治理-居民管理-热心审核历史', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd351f39-8795-11ea-8bc0-c03fd56f7847', 'work_grassroots_resi_warmhearted_audit', '基层治理-居民管理-热心居民审核', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd419af5-8795-11ea-8bc0-c03fd56f7847', 'org_agency_trace', '组织-查看上级机关', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd4c8553-8795-11ea-8bc0-c03fd56f7847', 'org_agency_update', '组织-机关单位-编辑', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd5e0d32-8795-11ea-8bc0-c03fd56f7847', 'org_subagency_list', '组织-下级机关-列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd728674-8795-11ea-8bc0-c03fd56f7847', 'org_subagency_create', '组织-下级机关-新增', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd8379c0-8795-11ea-8bc0-c03fd56f7847', 'org_subagency_delete', '组织-下级机关-删除', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd8f4734-8795-11ea-8bc0-c03fd56f7847', 'org_staff_update', '组织-工作人员-编辑', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bd9ae0d0-8795-11ea-8bc0-c03fd56f7847', 'org_staff_forbidden', '组织-工作人员-禁用', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bda5128a-8795-11ea-8bc0-c03fd56f7847', 'org_department_list', '组织-直属部门-部门列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bdb6d0da-8795-11ea-8bc0-c03fd56f7847', 'org_department_create', '组织-直属部门-新增部门', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bdcd2bbc-8795-11ea-8bc0-c03fd56f7847', 'org_department_update', '组织-直属部门-编辑部门', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bdde783e-8795-11ea-8bc0-c03fd56f7847', 'org_department_delete', '组织-直属部门-删除', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bded2047-8795-11ea-8bc0-c03fd56f7847', 'org_department_staff_add', '组织-直属部门-添加人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('bdf922c2-8795-11ea-8bc0-c03fd56f7847', 'org_department_staff_remove', '组织-直属部门-移除人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('be0536c7-8795-11ea-8bc0-c03fd56f7847', 'org_department_staff_list', '组织-直属部门-人员列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('be1a30fd-8795-11ea-8bc0-c03fd56f7847', 'org_grid_list', '组织-治理网格-网格列表', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('be2d8d7f-8795-11ea-8bc0-c03fd56f7847', 'org_grid_create', '组织-治理网格-新增网格', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('be3b107c-8795-11ea-8bc0-c03fd56f7847', 'org_grid_update', '组织-治理网格-编辑网格', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('be492f40-8795-11ea-8bc0-c03fd56f7847', 'org_grid_delete', '组织-治理网格-删除', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('be5571ce-8795-11ea-8bc0-c03fd56f7847', 'org_grid_staff_add', '组织-治理网格-新增网格工作人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('be616786-8795-11ea-8bc0-c03fd56f7847', 'org_grid_staff_remove', '组织-治理网格-移除网格工作人员', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('be6d73fa-8795-11ea-8bc0-c03fd56f7847', 'org_partymember_summary', '组织-党员-汇总信息', NULL, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation` VALUES ('c5a97eaafe8c0a7e2b18133c3c5642cf', 'work_project_trace_pending_list', '待处理', '待处理的项目，列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('c8b203a4ef34bff5e37e175bb101c5ca', 'work_grassroots_party_member_add', '添加党员', '支部管理-添加党员', 0, 0, 'APP_USER', '2020-06-18 19:31:53', 'APP_USER', '2020-06-18 19:31:53'); -INSERT INTO `operation` VALUES ('caa698937a169ca646341124a9868cfd', 'work_grassroots_issue_closed_list', '已关闭', '已关闭议题列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('cb88578ec778be4f0ab816c8375bc59a', 'work_grassroots_issue_shifted_project_list', '已转项目列表查询', '已转项目议题列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('cefc22ed6a226b257dbd41312ecd6d66', 'work_party_voice_draft_edit', '党建声音:编辑草稿', '编辑草稿', 0, 0, 'APP_USER', '2020-06-08 19:56:40', 'APP_USER', '2020-06-08 19:56:40'); -INSERT INTO `operation` VALUES ('cfa2e407e30a9c87a3e4ce4e6013a4f9', 'work_grassroots_group_audited', '基层治理:群组管理:审核历史', '基层治理:群组管理:审核历史列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('dee5672d4a08579280f4be886866a6c3', 'work_partyauth_auditing_detail', '基层治理:党员认证:待审核详情', '基层治理:党员认证:查看待审核详情', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('eb51c6570f62fc24b7754617bb698911', 'work_project_trace_created_list', '我发起', '我发起的项目，列表查询', 0, 0, 'APP_USER', '2020-05-11 17:58:36', 'APP_USER', '2020-05-11 17:58:36'); -INSERT INTO `operation` VALUES ('work_grassroots_issue_detail', 'work_grassroots_issue_detail', '议题详情', '议题详情界面所有的api添加此校验', 0, NULL, NULL, NULL, NULL, NULL); -COMMIT; - --- ---------------------------- --- Table structure for operation_scope --- ---------------------------- -DROP TABLE IF EXISTS `operation_scope`; -CREATE TABLE `operation_scope` ( - `ID` varchar(64) NOT NULL COMMENT 'id', - `SCOPE_KEY` varchar(30) NOT NULL COMMENT '范围key', - `SCOPE_NAME` varchar(30) NOT NULL COMMENT '范围名称', - `SCOPE_INDEX` varchar(30) NOT NULL COMMENT '范围序号', - `SERIES` varchar(30) NOT NULL COMMENT '范围所属系列', - `SORT` int(3) DEFAULT NULL COMMENT '排序字段', - `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', - `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='权限范围表'; - --- ---------------------------- --- Records of operation_scope --- ---------------------------- -BEGIN; -INSERT INTO `operation_scope` VALUES ('10', 'org_equal_and_sub', '同级组织及下级', 'oeb_10', 'org_level', 11, 1, NULL, NULL, '2020-04-29 19:01:37', NULL, NULL); -INSERT INTO `operation_scope` VALUES ('11', 'org_curr_sub', '本组织的下级', 'ocb_11', 'org_level', 9, 0, NULL, NULL, '2020-04-29 19:17:55', NULL, NULL); -INSERT INTO `operation_scope` VALUES ('12', 'org_equal_sub', '同级组织的下级', 'oeb_11', 'org_level', 13, 1, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('13', 'org_all', '所有组织', 'all', 'org_level', 4, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('14', 'org_curr_and_sup', '本组织及上级', 'ocp_10', 'org_level', 6, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('15', 'org_curr_sup', '本组织的上级', 'ocp_11', 'org_level', 5, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('16', 'org_equal_and_sup', '同级组织及上级', 'oep_10', 'org_level', 12, 1, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('17', 'org_equal_sup', '同级组织的上级', 'oep_11', 'org_level', 14, 1, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('18', 'i_created', '我创建的', 'ic_0', 'switch', 3, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('19', 'in_grid', '网格内', 'ig_0', 'switch', 2, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('2', 'org_curr', '本组织', 'oc_0', 'org_level', 7, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('20', 'in_department', '部门内', 'id_0', 'switch', 1, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('21', 'all', '无限制', 'all', 'all', 0, 0, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('3', 'org_equal', '同级组织', 'oe_0', 'org_level', 10, 1, NULL, NULL, NULL, NULL, NULL); -INSERT INTO `operation_scope` VALUES ('9', 'org_curr_and_sub', '本组织及下级', 'ocb_10', 'org_level', 8, 0, NULL, NULL, NULL, NULL, NULL); -COMMIT; - --- ---------------------------- --- Table structure for operation_scope_default --- ---------------------------- -DROP TABLE IF EXISTS `operation_scope_default`; -CREATE TABLE `operation_scope_default` ( - `ID` varchar(64) NOT NULL COMMENT 'id', - `ROLE_KEY` varchar(50) DEFAULT NULL COMMENT '角色key', - `OPERATION_KEY` varchar(50) NOT NULL COMMENT '操作key', - `SCOPE_KEY` varchar(50) NOT NULL COMMENT '范围key', - `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', - `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='默认操作范围表'; - --- ---------------------------- --- Records of operation_scope_default --- ---------------------------- -BEGIN; -INSERT INTO `operation_scope_default` VALUES ('005e11b48b1d2edf2f15936e7f74a2bc', 'grid_manager', 'work_grassroots_issue_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:16', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:16'); -INSERT INTO `operation_scope_default` VALUES ('00995b8408b605dfd7d52d3f25d8d1bb', 'grid_member', 'work_grassroots_group_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:26', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:26'); -INSERT INTO `operation_scope_default` VALUES ('00d50303addf5092330b670e6f3bf11b', 'grid_member', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:40', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:40'); -INSERT INTO `operation_scope_default` VALUES ('00fc3e2c97d1a34dda0888c3e37d0955', 'grid_member', 'work_grassroots_resi_warmhearted_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:57', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:57'); -INSERT INTO `operation_scope_default` VALUES ('01a8200c4ce4a71609e13f6bfc098d52', 'grid_manager', 'work_partyauth_audithistory_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:14'); -INSERT INTO `operation_scope_default` VALUES ('01ace7724d783ca5c003144913136241', 'grid_member', 'work_grassroots_party_branch_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:54', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:54'); -INSERT INTO `operation_scope_default` VALUES ('01c29c0332ddb06092fb61153d0c2c9c', 'agency_leader', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:14', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:14'); -INSERT INTO `operation_scope_default` VALUES ('035a25c3a5dcbb91149d5cbc818fd85d', 'manager', 'org_department_staff_add', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:58'); -INSERT INTO `operation_scope_default` VALUES ('05d9a44e61d0625c1d68682e75f7ce19', 'manager', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:58'); -INSERT INTO `operation_scope_default` VALUES ('062d53e8a76a815e64f93066b01b702c', 'grid_manager', 'work_grassroots_party_branch_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:31'); -INSERT INTO `operation_scope_default` VALUES ('0abf659ec8d0b2525052d3468b27905a', 'staff', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:10'); -INSERT INTO `operation_scope_default` VALUES ('0ea46f18afbcb60f485da3630cad1b70', 'party_principals', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:39'); -INSERT INTO `operation_scope_default` VALUES ('125c02cb1057ed636e12aa590a0c475b', 'manager', 'org_agency_update', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:35'); -INSERT INTO `operation_scope_default` VALUES ('159b03f72a404f07810a61f00ba552da', 'party_principals', 'work_party_voice_offline_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:10'); -INSERT INTO `operation_scope_default` VALUES ('16541f252fc7b814edc47feaaa5c26ee', 'grid_member', 'work_grassroots_group_audited', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:17', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:17'); -INSERT INTO `operation_scope_default` VALUES ('1791de862b12d6ba5afa03ed6df72cbd', 'grid_manager', 'work_grassroots_resi_warmhearted_audithistorylist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:45'); -INSERT INTO `operation_scope_default` VALUES ('18698932d1046f6eb64163d93f6a32c9', 'agency_leader', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:25', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:25'); -INSERT INTO `operation_scope_default` VALUES ('190282d7e12308661ab145c02d9b2186', 'party_principals', 'work_grassroots_party_branch_delete', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:49'); -INSERT INTO `operation_scope_default` VALUES ('1b57196d45cf870466638c73ed6b0303', 'agency_leader', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:20'); -INSERT INTO `operation_scope_default` VALUES ('1b8b9e715569e6e391de39f33a63c370', 'grid_member', 'work_grassroots_issue_shift_project', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:42', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:42'); -INSERT INTO `operation_scope_default` VALUES ('1c0d6fd0e0edd73de3dfaba59fc703c8', 'manager', 'org_department_delete', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:48'); -INSERT INTO `operation_scope_default` VALUES ('1c8a65da9664be7caa3f823dbbe0992d', 'dept_leader', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:13'); -INSERT INTO `operation_scope_default` VALUES ('1ce6cfa7ac3e03fed33e097088571322', 'manager', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:01'); -INSERT INTO `operation_scope_default` VALUES ('1d62ec213a0b103c58e181e4d84e2a3b', 'grid_party_director', 'work_grassroots_resi_warmhearted_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:08', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:08'); -INSERT INTO `operation_scope_default` VALUES ('1f51f59e4790440bceda0d33d9d2d704', 'grid_manager', 'work_partyauth_audited_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:47', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:47'); -INSERT INTO `operation_scope_default` VALUES ('2008244ebf45816c7a618185445e9939', 'manager', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:48'); -INSERT INTO `operation_scope_default` VALUES ('20ab79d3dea57c3181de12c6475c43bf', 'staff', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:06'); -INSERT INTO `operation_scope_default` VALUES ('223dfb7709ca4fcac60c3bf04a323fd2', 'grid_member', 'work_partyauth_audithistory_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:03'); -INSERT INTO `operation_scope_default` VALUES ('24174419d9d24ec0e6dd0f4a62423ffa', 'grid_party_director', 'work_party_voice_offline_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:22'); -INSERT INTO `operation_scope_default` VALUES ('244936f71cfbc04d6d05b09d69ffd128', 'grid_manager', 'work_grassroots_issue_shift_project', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:09', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:09'); -INSERT INTO `operation_scope_default` VALUES ('2666f4515e82849524dcfc927ffd46f2', 'grid_member', 'work_grassroots_group_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:27', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:27'); -INSERT INTO `operation_scope_default` VALUES ('28aedd888677fea7a18eee789481eff7', 'staff', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:37', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:37'); -INSERT INTO `operation_scope_default` VALUES ('297f4e4c1dccaef15de2927d5b81add0', 'grid_party_director', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:52', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:52'); -INSERT INTO `operation_scope_default` VALUES ('29c7c2912bb0daaffe173c50b0f269db', 'dept_leader', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:22'); -INSERT INTO `operation_scope_default` VALUES ('2af6b2b529a6613ebbdb8a578e40d816', 'grid_manager', 'work_partyauth_auditedlist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:36', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:36'); -INSERT INTO `operation_scope_default` VALUES ('2bae15afc6d0b671e83a2e5eb5aa015d', 'grid_member', 'work_grassroots_party_branch_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:15', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:15'); -INSERT INTO `operation_scope_default` VALUES ('2f687a6ae42c715d338c2a2f3284c220', 'grid_manager', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:31'); -INSERT INTO `operation_scope_default` VALUES ('2f7392ddda64b92fc87e4feaf9c99660', 'grid_party_director', 'work_partyauth_auditsubmit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:44'); -INSERT INTO `operation_scope_default` VALUES ('2f875b47a242864293a0a2bb96696502', 'grid_manager', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:06'); -INSERT INTO `operation_scope_default` VALUES ('33c5f62e11b3e09f7d01638498dae150', 'agency_leader', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:51'); -INSERT INTO `operation_scope_default` VALUES ('34f389145a9e9deb29cc855951cba433', 'grid_member', 'work_partyauth_auditsubmit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:32', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:32'); -INSERT INTO `operation_scope_default` VALUES ('3591b5f7d1926846c6ce84961a83379f', 'manager', 'org_department_update', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:37', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:37'); -INSERT INTO `operation_scope_default` VALUES ('35a68d37b59fe83451f8ad71394eed61', 'staff', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:27'); -INSERT INTO `operation_scope_default` VALUES ('3763443eece5d7b092d5f53e9db09fe7', 'grid_manager', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:50'); -INSERT INTO `operation_scope_default` VALUES ('37bf4e989e3b0390f4fed66184877b8f', 'grid_member', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:57', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:57'); -INSERT INTO `operation_scope_default` VALUES ('37fd9e080ce3ed93782d2cf6bf8b26e8', 'grid_manager', 'work_grassroots_party_branch_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:39', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:39'); -INSERT INTO `operation_scope_default` VALUES ('383cb9fdd17dc136f1e13bbce40ce82e', 'grid_member', 'work_partyauth_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:16', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:16'); -INSERT INTO `operation_scope_default` VALUES ('38554966ff80a640900a42b794c0accc', 'grid_manager', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:11'); -INSERT INTO `operation_scope_default` VALUES ('39457ab5872d584b8f4a080bff689743', 'grid_member', 'work_grassroots_issue_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:44'); -INSERT INTO `operation_scope_default` VALUES ('396a786f5f77cacde1dd488211d35594', 'grid_member', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:01'); -INSERT INTO `operation_scope_default` VALUES ('3b0e3fc804eee29ed3531132d0fd728f', 'grid_manager', 'work_grassroots_group_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:57', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:57'); -INSERT INTO `operation_scope_default` VALUES ('3b33a31aebd25a4ca01eecba32e211c4', 'manager', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:50'); -INSERT INTO `operation_scope_default` VALUES ('3b538bdddb7b0fe94add13b8fa70a759', 'grid_manager', 'work_grassroots_resi_warmhearted_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:36', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:36'); -INSERT INTO `operation_scope_default` VALUES ('3e0b90020d34005761a50fc4bfcfc685', 'grid_member', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:08', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:08'); -INSERT INTO `operation_scope_default` VALUES ('3e544119acfc7c7031526e78cfe5f62d', 'grid_member', 'work_grassroots_party_member_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:36', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:36'); -INSERT INTO `operation_scope_default` VALUES ('3f3f96a431559f8ed638e39b6c197530', 'grid_party_director', 'work_grassroots_group_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:45'); -INSERT INTO `operation_scope_default` VALUES ('3fa5168d047ad1e21e8657b09f227225', 'grid_manager', 'work_grassroots_party_branch_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:34', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:34'); -INSERT INTO `operation_scope_default` VALUES ('4082322584867a369c5e94779246cc05', 'grid_manager', 'work_partyauth_audithistory', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:45'); -INSERT INTO `operation_scope_default` VALUES ('42115bb11432c859bfaeaea094c82be8', 'grid_party_director', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:03'); -INSERT INTO `operation_scope_default` VALUES ('44a83d61ade712a22d544fa007723f36', 'grid_member', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:39'); -INSERT INTO `operation_scope_default` VALUES ('458db3ff13ee19e2491623a92a260db6', 'grid_party_director', 'work_grassroots_group_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:56', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:56'); -INSERT INTO `operation_scope_default` VALUES ('49398958f84560c5dd58cb2f45202aad', 'grid_party_director', 'work_party_voice_operation_list', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:59', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:59'); -INSERT INTO `operation_scope_default` VALUES ('4b5a767b3b632dcd6b8eb7a4be67885a', 'grid_member', 'work_grassroots_resi_warmhearted_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:20', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:20'); -INSERT INTO `operation_scope_default` VALUES ('4b7773f4458c145453f94c56c0aae305', 'manager', 'org_department_staff_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:19:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:19:50'); -INSERT INTO `operation_scope_default` VALUES ('4cf54beefdcebdc7d689175ad364e445', 'grid_member', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:29', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:29'); -INSERT INTO `operation_scope_default` VALUES ('4e5e0669b318ba33bae9d46ffba3fc95', 'manager', 'org_staff_update', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:42', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:42'); -INSERT INTO `operation_scope_default` VALUES ('4f7362d44df8a4970072841b6ef540e9', 'manager', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:00', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:00'); -INSERT INTO `operation_scope_default` VALUES ('4f9fbbbb70925e094cc50b2bf6ea7a49', 'manager', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:29', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:29'); -INSERT INTO `operation_scope_default` VALUES ('503af7d61aaabbc241d96f502eb1a16c', 'grid_party_director', 'work_grassroots_group_audited', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:24', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:24'); -INSERT INTO `operation_scope_default` VALUES ('5198ab882e61bced176df85026037af0', 'party_principals', 'work_party_voice_draft_delete', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:07'); -INSERT INTO `operation_scope_default` VALUES ('5296adedb2c58173d78ebeb43ebf4208', 'grid_member', 'work_grassroots_issue_close', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:55', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:55'); -INSERT INTO `operation_scope_default` VALUES ('539e31dfdce43c219535fcdab78b4766', 'grid_member', 'work_partyauth_auditedlist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:24:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:24:01'); -INSERT INTO `operation_scope_default` VALUES ('53f1ce7c063129dfed8fabcbcf635077', 'grid_party_director', 'work_grassroots_resi_warmhearted_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:15', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:15'); -INSERT INTO `operation_scope_default` VALUES ('56f453892fd7775b5ab07b187e5e572c', 'dept_leader', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:20'); -INSERT INTO `operation_scope_default` VALUES ('5824e979697e95ea86900056aa5467dd', 'manager', 'org_subagency_create', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:50'); -INSERT INTO `operation_scope_default` VALUES ('5900abb52724dac8afb69c5e6de2b043', 'manager', 'org_department_staff_remove', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:17:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:17:09'); -INSERT INTO `operation_scope_default` VALUES ('59f43f04ffa9dce8bc2e769cb1e06827', 'grid_member', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:13'); -INSERT INTO `operation_scope_default` VALUES ('5acb04aa4d836215587ddf4d0b951e3b', 'agency_leader', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:13'); -INSERT INTO `operation_scope_default` VALUES ('5afc450812bbc361c75aba06bd8af014', 'grid_manager', 'work_grassroots_issue_closed_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:14'); -INSERT INTO `operation_scope_default` VALUES ('5d64e24de420efd09ef16ff726ef4d85', 'staff', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:51:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:51:03'); -INSERT INTO `operation_scope_default` VALUES ('5e4a7ca32c1041d9000d372894c7d3d4', 'manager', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:35'); -INSERT INTO `operation_scope_default` VALUES ('5f0015d9c48ca9b7c80b1e7529e1fe60', 'grid_party_director', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:16'); -INSERT INTO `operation_scope_default` VALUES ('5f3724c18929a7846aa3673a9e15e85d', 'grid_party_director', 'work_partyauth_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:03'); -INSERT INTO `operation_scope_default` VALUES ('60563f47db3317b54803976d0528c949', 'grid_party_director', 'work_party_voice_draft_delete', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:26'); -INSERT INTO `operation_scope_default` VALUES ('605f091e0eeb0e148819ef544cfe4182', 'party_principals', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:23'); -INSERT INTO `operation_scope_default` VALUES ('621d0cbb47a545da6a8887345fce17a6', 'manager', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:35'); -INSERT INTO `operation_scope_default` VALUES ('62418f632d4cf93890ab2d6ccde8198e', 'grid_manager', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:13'); -INSERT INTO `operation_scope_default` VALUES ('64444359ebda79fb10e47f4467ecafb9', 'party_principals', 'work_party_voice_edit', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:13:57', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:13:57'); -INSERT INTO `operation_scope_default` VALUES ('64cc78ba21250aa7a2bb70a8509f3554', 'party_principals', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:33'); -INSERT INTO `operation_scope_default` VALUES ('650eb56c96184deed44769b09f206e6c', 'grid_manager', 'work_grassroots_resi_warmhearted_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:00', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:00'); -INSERT INTO `operation_scope_default` VALUES ('65a32edbb9475146a6ed357132f01a73', 'dept_leader', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:24', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:24'); -INSERT INTO `operation_scope_default` VALUES ('65c4a3f626c710ed230769854d7b2e4e', 'grid_party_director', 'work_grassroots_party_member_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:16', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:16'); -INSERT INTO `operation_scope_default` VALUES ('669f225859cae2e64ab22ec9bc282ed3', 'grid_member', 'work_grassroots_party_branch_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:06', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:06'); -INSERT INTO `operation_scope_default` VALUES ('6c06585e36a5042ada9cf411f26a3c37', 'grid_party_director', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:32'); -INSERT INTO `operation_scope_default` VALUES ('6e5618d97249d6105e0953fc849ab5fd', 'grid_manager', 'work_partyauth_auditinglist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:55', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:55'); -INSERT INTO `operation_scope_default` VALUES ('6e58133d47a9b768e014fece7f71705a', 'grid_party_director', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:30', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:30'); -INSERT INTO `operation_scope_default` VALUES ('70ef0720278dbc3560fe5c5f299e9220', 'dept_leader', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:11'); -INSERT INTO `operation_scope_default` VALUES ('72412f5fb6585ab0148d62a784e1ffbb', 'manager', 'org_staff_create', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:22'); -INSERT INTO `operation_scope_default` VALUES ('7441cdd97b691f153ee8e3b648fe456c', 'grid_party_director', 'work_grassroots_party_member_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:53', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:53'); -INSERT INTO `operation_scope_default` VALUES ('74baf9bd02f28c2c9ce375ad5e338ac7', 'grid_member', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:51'); -INSERT INTO `operation_scope_default` VALUES ('766d53e391838c3eeb362da528a8217d', 'grid_party_director', 'work_grassroots_resi_warmhearted_audithistorylist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:24', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:24'); -INSERT INTO `operation_scope_default` VALUES ('776e33172c8db19c1e40576ad33b38a6', 'agency_leader', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:05', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:05'); -INSERT INTO `operation_scope_default` VALUES ('777666e0e8a282443b27f7a22d05ec10', 'grid_party_director', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:22'); -INSERT INTO `operation_scope_default` VALUES ('792b4efe040ba2f8bf549ab936e5c407', 'grid_party_director', 'work_grassroots_resi_warmhearted_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:34', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:34'); -INSERT INTO `operation_scope_default` VALUES ('7a79a35f95edada16cd6d2a355b46fa8', 'agency_leader', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:26:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:26:27'); -INSERT INTO `operation_scope_default` VALUES ('7b0365f01be8d3f255833ba71bccd784', 'agency_leader', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:41', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:41'); -INSERT INTO `operation_scope_default` VALUES ('7b0c3e7f224c4d294746674e52240ea2', 'manager', 'org_department_create', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:26'); -INSERT INTO `operation_scope_default` VALUES ('7df6cc5ce7d7322855d7e669e9799f58', 'grid_party_director', 'work_grassroots_issue_shifted_project_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:12'); -INSERT INTO `operation_scope_default` VALUES ('7e5968a3c00f7ca3541c919ee6d36c52', 'grid_manager', 'work_partyauth_auditing_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:56', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:56'); -INSERT INTO `operation_scope_default` VALUES ('7ea897ef4722afa539926f4913a036f4', 'grid_manager', 'work_partyauth_auditsubmit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:54', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:54'); -INSERT INTO `operation_scope_default` VALUES ('801798f76e9d48a580e339c2b6e06a0c', 'agency_leader', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:04', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:04'); -INSERT INTO `operation_scope_default` VALUES ('8041825db8139cf47223a6647032c8d7', 'staff', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:34'); -INSERT INTO `operation_scope_default` VALUES ('80d127cff9293afa420f2b79808cf4d9', 'manager', 'org_grid_delete', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:55', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:55'); -INSERT INTO `operation_scope_default` VALUES ('811da25e14102eee984c0062ecfaf6e1', 'dept_leader', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:36', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:36'); -INSERT INTO `operation_scope_default` VALUES ('836dca9906b0980822429899ede19fc5', 'grid_party_director', 'work_grassroots_issue_close', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:10', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:10'); -INSERT INTO `operation_scope_default` VALUES ('83a5be91a21541cc8effffd633ff9444', 'manager', 'org_grid_staff_add', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:18'); -INSERT INTO `operation_scope_default` VALUES ('84873167c55f600ae83c00e41349854b', 'grid_member', 'work_grassroots_issue_voting_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:42', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:42'); -INSERT INTO `operation_scope_default` VALUES ('84c8107ec8d962371b757e9a34433143', 'party_principals', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:12', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:12'); -INSERT INTO `operation_scope_default` VALUES ('8590536d16f6d8a199ccef8b3b356d55', 'grid_party_director', 'work_grassroots_issue_shift_project', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:17', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:17'); -INSERT INTO `operation_scope_default` VALUES ('865355b47bb3bc46b9fb187585d10ad4', 'grid_party_director', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:49'); -INSERT INTO `operation_scope_default` VALUES ('86e7f717a125b93249b501fc7bfec5c8', 'staff', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:49'); -INSERT INTO `operation_scope_default` VALUES ('86f5eb8adb05164952e320caf310fa5f', 'manager', 'org_staff_forbidden', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:52', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:52'); -INSERT INTO `operation_scope_default` VALUES ('894c0602d250347b64974021878164a1', 'dept_leader', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:00', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:00'); -INSERT INTO `operation_scope_default` VALUES ('8b5f14f053be2b1e3223f31149ff4daf', 'grid_party_director', 'work_grassroots_issue_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:01'); -INSERT INTO `operation_scope_default` VALUES ('8b9fc990891638326b2b8eb26a59f4ac', 'grid_member', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:20'); -INSERT INTO `operation_scope_default` VALUES ('8bdc313c8809f7daf191fa2cab3e40cc', 'grid_member', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:24', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:24'); -INSERT INTO `operation_scope_default` VALUES ('8c9402c095a773c86f3354482f0352cd', 'grid_member', 'work_grassroots_issue_shifted_project_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:07', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:07'); -INSERT INTO `operation_scope_default` VALUES ('8cd953967f9f0e4892006753862e134c', 'grid_manager', 'work_grassroots_group_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:19', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:19'); -INSERT INTO `operation_scope_default` VALUES ('8d96cdbed7827e5e6353eace6724ea71', 'dept_leader', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:41', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:41'); -INSERT INTO `operation_scope_default` VALUES ('8ed5155bba9db8ac31205109310e8ed0', 'grid_manager', 'work_grassroots_issue_voting_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:01'); -INSERT INTO `operation_scope_default` VALUES ('8f08756a9eccb34522b6893542b5b3e9', 'grid_member', 'work_grassroots_party_member_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:26', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:26'); -INSERT INTO `operation_scope_default` VALUES ('8f7abe8da228e30e832f66523991ed87', 'grid_party_director', 'work_grassroots_party_branch_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:44'); -INSERT INTO `operation_scope_default` VALUES ('905c8e92495bec07a607e856b93b82ec', 'grid_party_director', 'work_grassroots_party_branch_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:25', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:25'); -INSERT INTO `operation_scope_default` VALUES ('909747637a3b1621b73f7d22a5761af3', 'party_principals', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:56'); -INSERT INTO `operation_scope_default` VALUES ('931252405255a8d9f6183e09e473c9ee', 'grid_party_director', 'work_party_voice_offline', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:33'); -INSERT INTO `operation_scope_default` VALUES ('943b4613b7102cfaf2ff85e56f55c4c6', 'grid_member', 'work_grassroots_party_member_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:43', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:43'); -INSERT INTO `operation_scope_default` VALUES ('9447e685c8878c772822481748b5fc71', 'agency_leader', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:26'); -INSERT INTO `operation_scope_default` VALUES ('9520a5ce4fc77223582e626904526e51', 'party_principals', 'work_party_voice_offline', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:19'); -INSERT INTO `operation_scope_default` VALUES ('956081e29921b396d8174fb882b7e06d', 'manager', 'org_grid_update', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:23'); -INSERT INTO `operation_scope_default` VALUES ('973b61d113a5eeb25e620a7ba89743e7', 'party_principals', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:16'); -INSERT INTO `operation_scope_default` VALUES ('9745482a6c37e3c7d5d637ce08ceb027', 'grid_party_director', 'work_partyauth_audithistory', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:35'); -INSERT INTO `operation_scope_default` VALUES ('978629e311c0d748c116a84904b412dd', 'staff', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:11'); -INSERT INTO `operation_scope_default` VALUES ('97f317e04a13582486f189510a93e880', 'dept_leader', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:34'); -INSERT INTO `operation_scope_default` VALUES ('99f907b51206171d5db3d13cbbb176ed', 'grid_manager', 'work_grassroots_party_member_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:04', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:04'); -INSERT INTO `operation_scope_default` VALUES ('9c203f0f3050b0336b6251066d538f3b', 'grid_party_director', 'work_grassroots_party_branch_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:19', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:19'); -INSERT INTO `operation_scope_default` VALUES ('9cce12dbb0056d537da114b08e91a92b', 'grid_member', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:07'); -INSERT INTO `operation_scope_default` VALUES ('9e51fae7254e1cbce1a54dfaaee5cb5b', 'grid_member', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:31'); -INSERT INTO `operation_scope_default` VALUES ('a0709146050af12b6de358d22f8e6321', 'grid_member', 'work_grassroots_issue_closed_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:46', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:46'); -INSERT INTO `operation_scope_default` VALUES ('a36f8291cc5d1f1d36e43ccd2fb31af9', 'grid_manager', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:18'); -INSERT INTO `operation_scope_default` VALUES ('a40d4eea9f171ef852c39ac3e9717afb', 'grid_manager', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:18'); -INSERT INTO `operation_scope_default` VALUES ('a47aef1ba94e2792f392774a53066eba', 'party_principals', 'work_party_voice_detail', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:47'); -INSERT INTO `operation_scope_default` VALUES ('a52ed73b6d8cce3898dc869f59134185', 'party_principals', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:09'); -INSERT INTO `operation_scope_default` VALUES ('a5be520b00e9c6a8fa90860c9417408b', 'party_principals', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:22:55', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:22:55'); -INSERT INTO `operation_scope_default` VALUES ('a605d56a98d9f1855a65d4826c39d75a', 'grid_party_director', 'work_grassroots_group_groupsinthegrid', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:05', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:05'); -INSERT INTO `operation_scope_default` VALUES ('a691a1d4df99cb9004d153e134ca67e9', 'staff', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:41', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:41'); -INSERT INTO `operation_scope_default` VALUES ('a7975a24ff0c8e37e5e1a332619c1ad3', 'grid_party_director', 'work_grassroots_party_member_edit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:56', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:56'); -INSERT INTO `operation_scope_default` VALUES ('a904dac982ee5dedf6871e8cd6d1d254', 'grid_member', 'work_grassroots_group_groupsinthegrid', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:47', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:47'); -INSERT INTO `operation_scope_default` VALUES ('aa0b0c536d511c533346a7b7b1b60407', 'grid_manager', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:38'); -INSERT INTO `operation_scope_default` VALUES ('aab5bdcade38cea38b0c275a5f3261e5', 'party_principals', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:47'); -INSERT INTO `operation_scope_default` VALUES ('abf92c6f4c5f9eb56567b9851c37305c', 'party_principals', 'work_grassroots_issue_shift_project', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:13'); -INSERT INTO `operation_scope_default` VALUES ('ac538be1c85cf690cdc94d61415cd571', 'dept_leader', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:52', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:52'); -INSERT INTO `operation_scope_default` VALUES ('ae33a07bf783947505f0ff9409927e17', 'manager', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:36', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:36'); -INSERT INTO `operation_scope_default` VALUES ('aed23c89f04989327fe40203fcd6701e', 'grid_party_director', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:04', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:04'); -INSERT INTO `operation_scope_default` VALUES ('b0325a2a39ed5d66e71e71a3ebe9eb21', 'grid_manager', 'work_grassroots_group_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:27:44'); -INSERT INTO `operation_scope_default` VALUES ('b2560da4979e8db491d62a59ce87b11d', 'party_principals', 'work_grassroots_resi_warmhearted_apply_detail', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:27'); -INSERT INTO `operation_scope_default` VALUES ('b26c6a55ce17bdf7cca1d2a8b7c0a2d9', 'staff', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:37', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:37'); -INSERT INTO `operation_scope_default` VALUES ('b475b35a3b45b568ab7d463a00f507ad', 'party_principals', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:31'); -INSERT INTO `operation_scope_default` VALUES ('b48a5a2f83c99a87b7bca35e93f9bf2b', 'manager', 'org_grid_create', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:13'); -INSERT INTO `operation_scope_default` VALUES ('b711480a6dfdaf1d73ab4fca481d5fa5', 'grid_manager', 'work_grassroots_group_audited', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:47', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:47'); -INSERT INTO `operation_scope_default` VALUES ('b920dbcac89fd79253eb16cb794e029c', 'manager', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:18'); -INSERT INTO `operation_scope_default` VALUES ('bb03d34358fb1376acd36cacc68aa5bd', 'staff', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:15', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:15'); -INSERT INTO `operation_scope_default` VALUES ('bb408b9da51f7b26e15105acb4f209c7', 'grid_manager', 'work_grassroots_issue_close', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:28:14'); -INSERT INTO `operation_scope_default` VALUES ('bc0b10f96d6fc63b82dde85613eb6804', 'manager', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:49'); -INSERT INTO `operation_scope_default` VALUES ('bc671716457f328ffd82b97a7f724947', 'grid_party_director', 'work_partyauth_auditedlist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:52', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:52'); -INSERT INTO `operation_scope_default` VALUES ('bd2fa250be4a3fb4822a5db52fcb8408', 'grid_manager', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:25', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:25'); -INSERT INTO `operation_scope_default` VALUES ('be471af1df9a68555fdaa341b93b2df1', 'grid_member', 'work_partyauth_audithistory', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:22', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:22'); -INSERT INTO `operation_scope_default` VALUES ('bf9bd00ab2d2186b73e8ce32cb79e45e', 'agency_leader', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:07'); -INSERT INTO `operation_scope_default` VALUES ('bfe9a6257cbe901664eaa568483d6f79', 'party_principals', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:23'); -INSERT INTO `operation_scope_default` VALUES ('c0363507ea85a756e0d8badb00dc1832', 'grid_party_director', 'work_grassroots_issue_closed_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:03'); -INSERT INTO `operation_scope_default` VALUES ('c16d9e353b14c714edf16f88c7930b6a', 'grid_party_director', 'work_partyauth_audithistory_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:09', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:09'); -INSERT INTO `operation_scope_default` VALUES ('c83dd1940246d39ee1609b4de7bd086a', 'grid_member', 'work_grassroots_group_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:38', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:38'); -INSERT INTO `operation_scope_default` VALUES ('c96f7bd4cec8f8993f6acb6edf91ea46', 'staff', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:44'); -INSERT INTO `operation_scope_default` VALUES ('cd5486edb6ebd18cdbde3b33d70f0132', 'agency_leader', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:05:53', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:05:53'); -INSERT INTO `operation_scope_default` VALUES ('cef6440af3e4a7c94276bcf7ec7f825a', 'grid_party_director', 'work_partyauth_auditing_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:35'); -INSERT INTO `operation_scope_default` VALUES ('d22829031515a75a7dcfcda1b899d5a7', 'grid_manager', 'work_grassroots_resi_warmhearted_audit', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:55', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:55'); -INSERT INTO `operation_scope_default` VALUES ('d3326317f36b4e6fdf6787849c3206f6', 'grid_manager', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:42', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:42'); -INSERT INTO `operation_scope_default` VALUES ('d4fe8198b7b59317d126007174e7ee3d', 'grid_manager', 'work_party_voice_operation_list', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:49'); -INSERT INTO `operation_scope_default` VALUES ('d63c06501cffc7c720522acaae4e9ce2', 'staff', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:13'); -INSERT INTO `operation_scope_default` VALUES ('d6407f2c31bef4a94e22e6e9a880cde3', 'grid_member', 'work_grassroots_resi_warmhearted_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:16', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:16'); -INSERT INTO `operation_scope_default` VALUES ('d661f0497d3904104d03a0cc85ecec13', 'party_principals', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:26'); -INSERT INTO `operation_scope_default` VALUES ('d6db94218b8aba5850e336d21438b889', 'grid_party_director', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:43', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:43'); -INSERT INTO `operation_scope_default` VALUES ('da2a31d3a108b66f4527b9d571bc0d04', 'grid_party_director', 'work_grassroots_issue_voting_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:58', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:58'); -INSERT INTO `operation_scope_default` VALUES ('db07037c89e5bdc9d1caf844405c13f9', 'party_principals', 'work_party_voice_draft_edit', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:05', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:05'); -INSERT INTO `operation_scope_default` VALUES ('db20d026f4913af40b73df80843ca0c3', 'staff', 'work_party_voice_operation_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:38'); -INSERT INTO `operation_scope_default` VALUES ('dbaa0ea119fb0f0a18b975f7c8098351', 'manager', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:05', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:05'); -INSERT INTO `operation_scope_default` VALUES ('dd61e8d1975a629f0e7d049a7d3284a1', 'staff', 'work_project_trace_return', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:58'); -INSERT INTO `operation_scope_default` VALUES ('ddc84057af63feea8e46cb02bde6f33a', 'grid_party_director', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:26'); -INSERT INTO `operation_scope_default` VALUES ('dde82049def92331e3605bb77a281e1e', 'dept_leader', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:44'); -INSERT INTO `operation_scope_default` VALUES ('de06cabd468ccc9b4fb05cb741438229', 'agency_leader', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:48'); -INSERT INTO `operation_scope_default` VALUES ('def1b3b2ee4d28b80400bd03ce9e493a', 'grid_member', 'work_party_voice_operation_list', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:54:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:54:13'); -INSERT INTO `operation_scope_default` VALUES ('df0aa5d70212e74f63ffff0aadc4d343', 'grid_party_director', 'work_grassroots_group_apply_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:45'); -INSERT INTO `operation_scope_default` VALUES ('df3b0048d163d9b4fa7249e5aaaa7491', 'grid_manager', 'work_grassroots_issue_shifted_project_list', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:28', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:28'); -INSERT INTO `operation_scope_default` VALUES ('e4dc754c75c7b4c9ba422386a6e1645b', 'grid_member', 'work_partyauth_audited_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:15', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:15'); -INSERT INTO `operation_scope_default` VALUES ('e635076b7812e513bc13c957e2781d3c', 'party_principals', 'work_party_voice_draft_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:01'); -INSERT INTO `operation_scope_default` VALUES ('e6ebb15d07698787238d1f05073918d0', 'grid_party_director', 'work_party_voice_draft_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:10'); -INSERT INTO `operation_scope_default` VALUES ('e7310fb01bb0d69d1ec3d620951ab93b', 'party_principals', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:28'); -INSERT INTO `operation_scope_default` VALUES ('e770cde77d409093bdc951ed3d03c79d', 'manager', 'org_subagency_delete', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:31'); -INSERT INTO `operation_scope_default` VALUES ('e7d10067e11bf2ee20ecc2fc8a64fccd', 'grid_party_director', 'work_partyauth_audited_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:35'); -INSERT INTO `operation_scope_default` VALUES ('e9e1187bbbc8e5283cfe1710e6d601d5', 'manager', 'org_grid_staff_remove', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:32'); -INSERT INTO `operation_scope_default` VALUES ('ecf49efa4d2b4c7d6fa06dc4ef7ec385', 'grid_party_director', 'work_party_voice_edit', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:23'); -INSERT INTO `operation_scope_default` VALUES ('f0a92070c06ada2336463b47f7761211', 'grid_party_director', 'work_party_voice_draft_edit', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:58'); -INSERT INTO `operation_scope_default` VALUES ('f26e3c4c0fc7b7a34e9354cd74b7617b', 'grid_manager', 'work_grassroots_group_groupsinthegrid', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:27', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:29:27'); -INSERT INTO `operation_scope_default` VALUES ('f3b96229505218a2e2e9c2d3741183ce', 'manager', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:25', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:25'); -INSERT INTO `operation_scope_default` VALUES ('f4a01e79e30bd0adcfef3baa3883cef1', 'dept_leader', 'org_department_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:20'); -INSERT INTO `operation_scope_default` VALUES ('f53e80923c35740f1417fd5e6ba67e45', 'grid_party_director', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:53', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:53'); -INSERT INTO `operation_scope_default` VALUES ('f5403e514cf3e29b0c90a74bb2b4daa5', 'grid_member', 'work_partyauth_auditing_detail', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:29', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:29'); -INSERT INTO `operation_scope_default` VALUES ('f5d8fee7ca54f8e74d16f931d4ca0057', 'grid_member', 'work_grassroots_resi_warmhearted_audithistorylist', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:07', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:07'); -INSERT INTO `operation_scope_default` VALUES ('f6da660f4e4eadc70417bb65937cea93', 'agency_leader', 'work_party_voice_published_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:50'); -INSERT INTO `operation_scope_default` VALUES ('f77bc026c4032ed36a10f531725af035', 'grid_party_director', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:22'); -INSERT INTO `operation_scope_default` VALUES ('f875914de9e7e2ae77f51e8252493d32', 'manager', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:33'); -INSERT INTO `operation_scope_default` VALUES ('f89454516debd51ffd47c298c28477b1', 'party_principals', 'work_grassroots_party_member_delete', 'in_grid', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:59', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:59'); -INSERT INTO `operation_scope_default` VALUES ('fa1e6ae541742fea7f52439c2afc987d', 'grid_manager', 'work_grassroots_party_member_delete', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:06', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:06'); -INSERT INTO `operation_scope_default` VALUES ('fa527b93295745aa1cdb6276bb066f15', 'manager', 'work_project_trace_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:24', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:24'); -INSERT INTO `operation_scope_default` VALUES ('fac6b7030b3ede7f3d949f8de2581b48', 'grid_manager', 'work_project_trace_pending_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:54'); -INSERT INTO `operation_scope_default` VALUES ('fb7c9febf46f1b08a749f27c469f5741', 'party_principals', 'work_project_trace_transfer', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:42', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:42'); -INSERT INTO `operation_scope_default` VALUES ('fb95e1d2c1362dc09f2ab7df699abb52', 'grid_party_director', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:58'); -INSERT INTO `operation_scope_default` VALUES ('fbb751cf3915871b3fb56c0ae900879f', 'grid_manager', 'org_agency_trace', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:50'); -INSERT INTO `operation_scope_default` VALUES ('fd860e7b5622eb25fc88c4d9d947d57e', 'grid_member', 'org_staff_detail', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:57', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:57'); -INSERT INTO `operation_scope_default` VALUES ('fd90519d2e621648919121136ec5f8eb', 'dept_leader', 'org_grid_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:55', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:55'); -INSERT INTO `operation_scope_default` VALUES ('fda313490bc52c593a67014ba33da1f6', 'dept_leader', 'work_project_trace_close', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:38'); -INSERT INTO `operation_scope_default` VALUES ('fe10275b93d00df0dc3f187b25a979c7', 'agency_leader', 'work_project_trace_created_list', 'i_created', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:31'); -INSERT INTO `operation_scope_default` VALUES ('fe8c6180c5f706ef16b6407b417aea25', 'dept_leader', 'org_staff_list', 'all', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:09'); -INSERT INTO `operation_scope_default` VALUES ('fea47239eb21e3800ed6b3279f9eba00', 'grid_manager', 'org_subagency_list', 'org_curr_and_sub', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:40', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:40'); -INSERT INTO `operation_scope_default` VALUES ('ffb5e0429acb214d697bf5429942f433', 'grid_manager', 'work_grassroots_party_member_add', 'in_grid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:05', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:30:05'); -COMMIT; - --- ---------------------------- --- Table structure for role_operation --- ---------------------------- -DROP TABLE IF EXISTS `role_operation`; -CREATE TABLE `role_operation` ( - `ID` varchar(64) NOT NULL, - `ROLE_ID` varchar(64) NOT NULL COMMENT '角色ID', - `OPERATION_KEY` varchar(64) NOT NULL COMMENT '操作key', - `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', - `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色能进行那些操作'; - --- ---------------------------- --- Table structure for role_operation_default --- ---------------------------- -DROP TABLE IF EXISTS `role_operation_default`; -CREATE TABLE `role_operation_default` ( - `ID` varchar(64) NOT NULL, - `ROLE_KEY` varchar(64) NOT NULL COMMENT '角色KEY', - `OPERATION_KEY` varchar(64) NOT NULL COMMENT '操作key', - `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', - `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色默认的可操作功能列表'; - --- ---------------------------- --- Records of role_operation_default --- ---------------------------- -BEGIN; -INSERT INTO `role_operation_default` VALUES ('0289abd959a0ebf2abce5396468dafe7', 'grid_party_director', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:17', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:17'); -INSERT INTO `role_operation_default` VALUES ('02eb60c8797a4e651503579883788e72', 'grid_party_director', 'work_party_voice_draft_edit', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:50'); -INSERT INTO `role_operation_default` VALUES ('0475f84e613b677688b1431ee326dd1c', 'grid_party_director', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:00', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:00'); -INSERT INTO `role_operation_default` VALUES ('049f7e8fc67032fe1dc028024f8e2484', 'grid_member', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:27'); -INSERT INTO `role_operation_default` VALUES ('0637f74993ba4d1b3a31ca81a1a6f313', 'grid_member', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:04', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:04'); -INSERT INTO `role_operation_default` VALUES ('069a15a004afcc99612d197875ca8d76', 'grid_party_director', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:19'); -INSERT INTO `role_operation_default` VALUES ('06f1b8aca3cf66252a9935b0b53879c2', 'grid_member', 'work_grassroots_group_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:25', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:25'); -INSERT INTO `role_operation_default` VALUES ('070dee52fab9b698e679e95a1cff8d5d', 'grid_manager', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:46', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:46'); -INSERT INTO `role_operation_default` VALUES ('08681d50db47f596868fa17dd488d48a', 'grid_party_director', 'work_grassroots_resi_warmhearted_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:32', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:32'); -INSERT INTO `role_operation_default` VALUES ('116310930b7d8f3133ec80ed6283d9e4', 'agency_leader', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:24', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:24'); -INSERT INTO `role_operation_default` VALUES ('136ef46673e9d750b6a1f0e2e67848db', 'grid_member', 'work_grassroots_resi_warmhearted_audithistorylist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:04', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:04'); -INSERT INTO `role_operation_default` VALUES ('13e0238a8cb33937bb651fe528b16e1b', 'manager', 'org_agency_update', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:33'); -INSERT INTO `role_operation_default` VALUES ('13e20f719d5fac5e201ad927c898d379', 'grid_party_director', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:50'); -INSERT INTO `role_operation_default` VALUES ('1447d113b690ad1a506c7b5a1fe39551', 'manager', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:22'); -INSERT INTO `role_operation_default` VALUES ('14b31b0e3feab83493f66a2feaf1f2be', 'grid_party_director', 'work_partyauth_audithistory', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:32', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:32'); -INSERT INTO `role_operation_default` VALUES ('14cb74bcd79db4c3448862938cf7a5f9', 'grid_party_director', 'work_grassroots_resi_warmhearted_audithistorylist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:22', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:22'); -INSERT INTO `role_operation_default` VALUES ('15159a02df17c662fbcb8b2501d1ed2a', 'grid_party_director', 'work_grassroots_party_member_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:12'); -INSERT INTO `role_operation_default` VALUES ('173dd26aa1b69d033b2747ec1268348f', 'grid_member', 'work_grassroots_party_member_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:29', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:29'); -INSERT INTO `role_operation_default` VALUES ('1cbcc4966ce00e0b56680154968a2af2', 'grid_manager', 'work_partyauth_audited_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('1cc59a2110373ac363d37664475d8d25', 'grid_member', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:25:10'); -INSERT INTO `role_operation_default` VALUES ('1d3339cb6f82f717dc369b92f6c3016e', 'staff', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:38'); -INSERT INTO `role_operation_default` VALUES ('1f2254af4e68dad4ba5c3d19cbb4a36f', 'party_principals', 'work_party_voice_edit', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:13:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:13:51'); -INSERT INTO `role_operation_default` VALUES ('1fc0e80be3ec5c82faa992fa922823fa', 'party_principals', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:54'); -INSERT INTO `role_operation_default` VALUES ('20e26fb75c3bae4b7ccc83afa47aafdc', 'manager', 'org_department_staff_add', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:56'); -INSERT INTO `role_operation_default` VALUES ('21035a4ddb84d1c4285a24525d01dda6', 'grid_member', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:21', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:21'); -INSERT INTO `role_operation_default` VALUES ('2106bc0e49a6dd926b563a7193005cfa', 'grid_manager', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:51'); -INSERT INTO `role_operation_default` VALUES ('227d1d029f8d52161fe2e71463d2991d', 'grid_manager', 'work_grassroots_party_member_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:03'); -INSERT INTO `role_operation_default` VALUES ('22fe8c877acf26de5f3a862a6fb89674', 'grid_member', 'work_partyauth_audithistory', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:19', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:19'); -INSERT INTO `role_operation_default` VALUES ('231a06771b7d20ed1581dc3955d78389', 'party_principals', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:09'); -INSERT INTO `role_operation_default` VALUES ('254e24cc7ac14ef2b61e3dad52a76189', 'grid_manager', 'work_grassroots_resi_warmhearted_audithistorylist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('254f65d14acab1f197a3e3ec9d93e1dc', 'staff', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:51:00', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:51:00'); -INSERT INTO `role_operation_default` VALUES ('27283afba2049162c32b5a448e720013', 'party_principals', 'work_party_voice_draft_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:56'); -INSERT INTO `role_operation_default` VALUES ('275539f5c14f606c22028b110cd8d474', 'grid_member', 'work_partyauth_auditedlist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:58', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:58'); -INSERT INTO `role_operation_default` VALUES ('2adddd38d06cca9c98c092ba91e7a22b', 'party_principals', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:22:40', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:22:40'); -INSERT INTO `role_operation_default` VALUES ('2c0ea5441d8ba2d2b4cfdff871e49f99', 'dept_leader', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:10'); -INSERT INTO `role_operation_default` VALUES ('2d21da3e0058fe74470967151076a89a', 'party_principals', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:18'); -INSERT INTO `role_operation_default` VALUES ('2f6cb049f67b89e3251a58dc00ea1acf', 'party_principals', 'work_grassroots_party_branch_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:45', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:45'); -INSERT INTO `role_operation_default` VALUES ('2f9945850e2d5236f3c4647f32c30a5e', 'grid_party_director', 'work_party_voice_offline_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:19'); -INSERT INTO `role_operation_default` VALUES ('31c9afb05b07e93177c1222e7fef7bee', 'grid_member', 'work_partyauth_auditing_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:27', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:27'); -INSERT INTO `role_operation_default` VALUES ('3571ccb11e1b2a565ba905f6e6af5940', 'grid_manager', 'work_grassroots_group_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('36aa939fb0602f0ceaa5bdfec098324a', 'manager', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:27'); -INSERT INTO `role_operation_default` VALUES ('375516161db1f9e07a41c2ba3a3dd2ba', 'grid_party_director', 'work_partyauth_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:01'); -INSERT INTO `role_operation_default` VALUES ('37c5fe7ae4c4e7b35bfdfbc7c20e9d35', 'party_principals', 'work_grassroots_issue_shift_project', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:11'); -INSERT INTO `role_operation_default` VALUES ('37fdf7161a4aac9a76cb15fdbc8551e5', 'grid_manager', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:16'); -INSERT INTO `role_operation_default` VALUES ('38294de22b45d00c290488de2a9d4144', 'grid_party_director', 'work_grassroots_party_branch_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:41', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:41'); -INSERT INTO `role_operation_default` VALUES ('385aee084d7a9434cc2cef79749a56e9', 'grid_manager', 'work_grassroots_party_member_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('3b0259bae0e70700f61e4a2e76827c9a', 'agency_leader', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:39'); -INSERT INTO `role_operation_default` VALUES ('3d22b4b7d89f754be4f2e094e50214aa', 'grid_party_director', 'work_party_voice_draft_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:15:19'); -INSERT INTO `role_operation_default` VALUES ('3e60e284ae798aabd57dfbff176bea67', 'dept_leader', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:32'); -INSERT INTO `role_operation_default` VALUES ('40d0364618cbf4af254e5faf399c15b6', 'grid_manager', 'work_partyauth_audithistory', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('4293834f97fbe2186da31f0009b361ff', 'manager', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:56'); -INSERT INTO `role_operation_default` VALUES ('43111e1fd8a1295447f57c416811c902', 'grid_manager', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:39'); -INSERT INTO `role_operation_default` VALUES ('43527e686db5e44b8064d354fe1b4910', 'agency_leader', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:16'); -INSERT INTO `role_operation_default` VALUES ('438574b4c8136b6cade911c5f8790172', 'grid_member', 'work_grassroots_group_groupsinthegrid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:45', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:45'); -INSERT INTO `role_operation_default` VALUES ('463b1b26e8231efb686a0094a737a45c', 'grid_manager', 'work_grassroots_party_branch_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('463cfd33331faf659693237fb9b427a9', 'party_principals', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:23'); -INSERT INTO `role_operation_default` VALUES ('46fc85f884c34fee50357d4670ec0cb8', 'manager', 'org_department_update', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:34'); -INSERT INTO `role_operation_default` VALUES ('4769584f304aa2c913cf4990c1f709a1', 'grid_member', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:54'); -INSERT INTO `role_operation_default` VALUES ('47dbc5dedc953a9c42bbd08a1ea751d5', 'staff', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:40', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:40'); -INSERT INTO `role_operation_default` VALUES ('49ef95b1c5d71ab5970d0447b4432f61', 'grid_party_director', 'work_grassroots_group_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:43', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:43'); -INSERT INTO `role_operation_default` VALUES ('4a359a53602f8f37b8e6505dec2f31fc', 'grid_manager', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:48'); -INSERT INTO `role_operation_default` VALUES ('4bf7893ace8071dd67b07ae9f625219d', 'grid_manager', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:44'); -INSERT INTO `role_operation_default` VALUES ('4c6028019612bc0b111037256d707acb', 'party_principals', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:07'); -INSERT INTO `role_operation_default` VALUES ('4c83b945c5e09938fc8cd9b1ee12c991', 'manager', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:56'); -INSERT INTO `role_operation_default` VALUES ('4cb5c47f6b80b23bb996940cb819e91a', 'manager', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:59', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:59'); -INSERT INTO `role_operation_default` VALUES ('4dca87965fb7cf4c85c803dd1a3e277c', 'grid_party_director', 'work_grassroots_group_audited', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:22', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:22'); -INSERT INTO `role_operation_default` VALUES ('4e722e7346e4a5a63ae4d041ca8a038a', 'dept_leader', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:18'); -INSERT INTO `role_operation_default` VALUES ('4f675edb6edae20444536913c8d90d95', 'agency_leader', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:28'); -INSERT INTO `role_operation_default` VALUES ('4f9409d3f2f8c39849854e6a2b4d9f75', 'grid_member', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:28'); -INSERT INTO `role_operation_default` VALUES ('505742024aad3d92e1833cb6da0d3e1d', 'manager', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:33'); -INSERT INTO `role_operation_default` VALUES ('5255dbfec7e33abe2f534ce5269a85c0', 'grid_member', 'work_partyauth_auditsubmit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:29', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:29'); -INSERT INTO `role_operation_default` VALUES ('539550c5d0564b1aed06ea926d73cb41', 'staff', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:07'); -INSERT INTO `role_operation_default` VALUES ('54dbf69ad528bfd78b8ff43f5b071e3d', 'staff', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:07'); -INSERT INTO `role_operation_default` VALUES ('57fab5120f467e3a9dbd9c750017698b', 'grid_party_director', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:56'); -INSERT INTO `role_operation_default` VALUES ('581c4ccc54ee9b2726c15d63a77b6069', 'manager', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:30', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:30'); -INSERT INTO `role_operation_default` VALUES ('583f568c8288188162ec0c8aa9d75073', 'party_principals', 'work_party_voice_draft_edit', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:26:09'); -INSERT INTO `role_operation_default` VALUES ('58e710f50d30366c0de847d601fe1e02', 'manager', 'org_department_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:45', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:45'); -INSERT INTO `role_operation_default` VALUES ('58e95771d8fd1335cf03f12193a164a7', 'agency_leader', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:05:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:05:49'); -INSERT INTO `role_operation_default` VALUES ('5af2c8623d516626e9c4fa65c8784a8b', 'grid_member', 'work_grassroots_issue_closed_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:44', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:44'); -INSERT INTO `role_operation_default` VALUES ('5cc50eb4730af738cb5cc0d6f062f8b1', 'grid_member', 'work_grassroots_party_branch_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:51', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:51'); -INSERT INTO `role_operation_default` VALUES ('5d80bad76f6176a9fc1bffdcb30c70f7', 'grid_manager', 'work_grassroots_party_branch_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('5eae700ac79621f4192c725b61901f5a', 'grid_manager', 'work_grassroots_resi_warmhearted_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:56', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:56'); -INSERT INTO `role_operation_default` VALUES ('5f2b6f637b756de578d1171e817ba4ff', 'manager', 'org_grid_create', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:07'); -INSERT INTO `role_operation_default` VALUES ('5f69b448af0c45a2521639a2b57ed6cf', 'manager', 'org_grid_staff_remove', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:28'); -INSERT INTO `role_operation_default` VALUES ('6023d87d5739c52841773cad4413028f', 'party_principals', 'work_party_voice_draft_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:57', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:57'); -INSERT INTO `role_operation_default` VALUES ('6039c7f1ea5dee504f73ec78ca1c6ad6', 'dept_leader', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:11'); -INSERT INTO `role_operation_default` VALUES ('6100229547cbe452018fd052f095d231', 'grid_party_director', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:49'); -INSERT INTO `role_operation_default` VALUES ('626076ade70febdef198db0d3293040c', 'grid_member', 'work_grassroots_issue_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:41', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:41'); -INSERT INTO `role_operation_default` VALUES ('62c2f0504db5bef6e1e721c481e78a02', 'grid_party_director', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:47'); -INSERT INTO `role_operation_default` VALUES ('62c76b255a9beb914aabff9e23e37d8c', 'grid_member', 'work_grassroots_resi_warmhearted_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:13', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:39:13'); -INSERT INTO `role_operation_default` VALUES ('65a4a38883e544b88880ec88b1ce8394', 'grid_member', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:58'); -INSERT INTO `role_operation_default` VALUES ('65d5fec050a882b4cf450c224d095e61', 'manager', 'org_subagency_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:28'); -INSERT INTO `role_operation_default` VALUES ('6809801bab3850d83553a05f5585fd46', 'grid_manager', 'work_grassroots_issue_closed_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('69fbfb2a52cd636c9ef35702ced685e9', 'party_principals', 'work_grassroots_party_member_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:56', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:53:56'); -INSERT INTO `role_operation_default` VALUES ('6a5da2bcfd8e930660c06255b18ddc77', 'grid_member', 'work_grassroots_party_member_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:40', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:36:40'); -INSERT INTO `role_operation_default` VALUES ('6cd63ec554700a64f2c0c76f0ab93631', 'grid_manager', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:11'); -INSERT INTO `role_operation_default` VALUES ('70899fd06a942784f53b37187a2c85b4', 'grid_member', 'work_partyauth_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:14'); -INSERT INTO `role_operation_default` VALUES ('72cb555761e80a1d2e98f11c2a80fd0b', 'manager', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:46', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:46'); -INSERT INTO `role_operation_default` VALUES ('7480bd87973370d46804639c34bd1436', 'grid_manager', 'work_grassroots_resi_warmhearted_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('777495e37240760fe6f9dd74a8ae3b60', 'staff', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:10', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:10'); -INSERT INTO `role_operation_default` VALUES ('7937c47e206fb5bd3910f684f7e22398', 'dept_leader', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:31'); -INSERT INTO `role_operation_default` VALUES ('79465062229f9ff7f6c8f2fed3fc2db9', 'grid_manager', 'work_grassroots_resi_warmhearted_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('79f139b1166c835fe2a5d3f86a846a53', 'manager', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:31', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:31'); -INSERT INTO `role_operation_default` VALUES ('7a1bb59a8027c160dea4cde1f9298dd7', 'grid_party_director', 'work_partyauth_auditsubmit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:41', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:41'); -INSERT INTO `role_operation_default` VALUES ('7ab1834eb95c7bf8ac2e7f5a02292d23', 'grid_manager', 'work_grassroots_issue_shifted_project_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('7c47f47e05a5c71a7b8d2f6e4c7ce44b', 'dept_leader', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:06'); -INSERT INTO `role_operation_default` VALUES ('7c8d4f4322e9a481585261994cdcf45e', 'grid_party_director', 'work_partyauth_audithistory_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:06', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:06'); -INSERT INTO `role_operation_default` VALUES ('7d2af7c6593d7f4908aa4f34cd6aa3bf', 'staff', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:12', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:12'); -INSERT INTO `role_operation_default` VALUES ('7d48526135432d768ba65ab77c94fd3c', 'grid_manager', 'work_partyauth_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:52', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:52'); -INSERT INTO `role_operation_default` VALUES ('7e1e513f73b3d7d20824b3b8c6964030', 'manager', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:48'); -INSERT INTO `role_operation_default` VALUES ('7eaf88ad10ba837da4ca000ed4ae485a', 'grid_manager', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:26'); -INSERT INTO `role_operation_default` VALUES ('7ec619cc7f756e755ffe225bef4cfad6', 'grid_manager', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:11'); -INSERT INTO `role_operation_default` VALUES ('8244a19b5ec5997c02f7dd8970e6d5e9', 'agency_leader', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:01:45', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:01:45'); -INSERT INTO `role_operation_default` VALUES ('84414a80fa2658fa7a7fb0e602d4708d', 'grid_party_director', 'work_party_voice_offline', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:26', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:26'); -INSERT INTO `role_operation_default` VALUES ('8495710786ffb6d9372f28e61349c5e8', 'grid_party_director', 'work_grassroots_resi_warmhearted_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:06', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:06'); -INSERT INTO `role_operation_default` VALUES ('8554ba31af513654a577a8a245c0877d', 'grid_member', 'work_grassroots_party_member_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:23', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:20:23'); -INSERT INTO `role_operation_default` VALUES ('856d120f343da93d95ed0812ed1e76a1', 'grid_member', 'work_partyauth_audithistory_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:00', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:00'); -INSERT INTO `role_operation_default` VALUES ('8588b47f86e538c360e0f72e73d68f7c', 'agency_leader', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:46', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:46'); -INSERT INTO `role_operation_default` VALUES ('86e00f87c98af26d64b6a040672799c9', 'grid_manager', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:03'); -INSERT INTO `role_operation_default` VALUES ('874ec6601735a2f3e6a3e94aafe5e4ed', 'grid_member', 'work_grassroots_party_branch_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:03'); -INSERT INTO `role_operation_default` VALUES ('880139add57f9835418bd09d59a6f969', 'grid_member', 'work_grassroots_group_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:35', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:35'); -INSERT INTO `role_operation_default` VALUES ('894fbbea0d0e9a6c5d61bce1abb58699', 'grid_member', 'work_grassroots_issue_shift_project', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:39', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:39'); -INSERT INTO `role_operation_default` VALUES ('8a158026cc022b0100ce56fb23e41876', 'grid_party_director', 'work_grassroots_issue_shifted_project_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:10', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:10'); -INSERT INTO `role_operation_default` VALUES ('8a2e0a8225dc52932f1d5b44e50db6c5', 'grid_member', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:58'); -INSERT INTO `role_operation_default` VALUES ('8b4277e7fbef3486fe6a17532834a1c9', 'dept_leader', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:50'); -INSERT INTO `role_operation_default` VALUES ('8b5e7d3ce6567d4c4159f79a9ed05ec8', 'grid_member', 'work_grassroots_issue_close', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:52', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:52'); -INSERT INTO `role_operation_default` VALUES ('8c2815fd2fef18af685c80f1cd891631', 'party_principals', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:29', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:29'); -INSERT INTO `role_operation_default` VALUES ('8c92f231577a9fbe2453c9287adb1832', 'grid_party_director', 'work_party_voice_draft_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:07'); -INSERT INTO `role_operation_default` VALUES ('8f0025cb10698087121d8c78940050a0', 'manager', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:02', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:02'); -INSERT INTO `role_operation_default` VALUES ('8fc3764cf57c8d7b41cf196d7502b528', 'grid_member', 'work_grassroots_resi_warmhearted_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:54', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:54'); -INSERT INTO `role_operation_default` VALUES ('8fdbff8b62b89a76aaa2f9357c5a4125', 'grid_party_director', 'work_party_voice_publish', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:16:53', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:16:53'); -INSERT INTO `role_operation_default` VALUES ('908fa32614b6d620bf9d90938642767d', 'grid_manager', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:37', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:37'); -INSERT INTO `role_operation_default` VALUES ('921ed32bf78c233030d11daaf1777846', 'grid_party_director', 'work_party_voice_edit', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:14:09'); -INSERT INTO `role_operation_default` VALUES ('9233d75ed19bb91296efe0eb4a289d2d', 'dept_leader', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:24:34'); -INSERT INTO `role_operation_default` VALUES ('92f2fda334c4f3263740413a41739d01', 'dept_leader', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:52:58'); -INSERT INTO `role_operation_default` VALUES ('939fbd0f2f6f292777b48fd4820bcfa1', 'party_principals', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:56:44'); -INSERT INTO `role_operation_default` VALUES ('98855ddd12c2bd2533b66f6c74b4169d', 'staff', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:09:20'); -INSERT INTO `role_operation_default` VALUES ('993f20fef7ef4ddd9b740cd38337d2a9', 'grid_member', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:54'); -INSERT INTO `role_operation_default` VALUES ('9949060f474b7ad59464d5078349de54', 'agency_leader', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:26:17', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:26:17'); -INSERT INTO `role_operation_default` VALUES ('9ac9c70a52c3947977f4d2ea00544aaf', 'agency_leader', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:47:22'); -INSERT INTO `role_operation_default` VALUES ('9c320477f830971b20de4fd2c6e0df44', 'party_principals', 'work_party_voice_offline', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:14', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:23:14'); -INSERT INTO `role_operation_default` VALUES ('9cd3bec9bca3475195363d8bfacdad89', 'grid_manager', 'work_partyauth_auditing_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('9d76641c3ea32be45805df59eb583e5d', 'grid_member', 'work_grassroots_party_branch_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:12'); -INSERT INTO `role_operation_default` VALUES ('9df215b3633c82f506a9cdd343e85052', 'dept_leader', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:27:39'); -INSERT INTO `role_operation_default` VALUES ('9ea7ca2c1471cd0ed0b0c934a5379d1d', 'grid_manager', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:35'); -INSERT INTO `role_operation_default` VALUES ('9f2c651644e6419ed8f257625f286c11', 'grid_member', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:54:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:54:06'); -INSERT INTO `role_operation_default` VALUES ('9f5cc3348750c6b120ef91e9140fd855', 'grid_party_director', 'work_grassroots_issue_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:58', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:58'); -INSERT INTO `role_operation_default` VALUES ('9f9a78cf71ac9255544f917dc73ce7d9', 'grid_member', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:58', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:58'); -INSERT INTO `role_operation_default` VALUES ('a04ac689a00d143f50bac24515c1307e', 'grid_party_director', 'work_grassroots_group_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:42', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:42'); -INSERT INTO `role_operation_default` VALUES ('a236bbc05d81165d56bf6d6b316704e0', 'dept_leader', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:51', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:51'); -INSERT INTO `role_operation_default` VALUES ('a2878a38ff52c861993553dc3ecb8b5b', 'grid_member', 'work_grassroots_issue_voting_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:40', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:40'); -INSERT INTO `role_operation_default` VALUES ('a28b8cf3eb4b7a7aed505c2befa52de4', 'party_principals', 'work_party_voice_publish', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:16:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:16:09'); -INSERT INTO `role_operation_default` VALUES ('a3cb9fcb7857dfc1c82b2e74f590aeb7', 'grid_party_director', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:55', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:55'); -INSERT INTO `role_operation_default` VALUES ('a51c3b1d734211a05e4078d47a9e3e95', 'grid_party_director', 'work_grassroots_group_groupsinthegrid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:03', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:03'); -INSERT INTO `role_operation_default` VALUES ('a547fbfb08aad3a3a99ccc6804de2b7e', 'grid_party_director', 'org_staff_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:25:39'); -INSERT INTO `role_operation_default` VALUES ('a7e669209facf696931d19b312054d8c', 'manager', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:32'); -INSERT INTO `role_operation_default` VALUES ('adc46a20f1fbde1dbb04aa32e66f0770', 'grid_manager', 'work_partyauth_audithistory_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('b086c55b97d263fa275277a6579351a6', 'manager', 'org_grid_delete', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:34'); -INSERT INTO `role_operation_default` VALUES ('b28b390ff05c120c33ba2898516e263d', 'grid_manager', 'work_partyauth_auditsubmit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('b290267e0d4f69fc9e90bfdb2a66c15d', 'grid_party_director', 'work_grassroots_party_branch_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:17', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:17'); -INSERT INTO `role_operation_default` VALUES ('b3ff03df3cf64661fcb7e889830a85e9', 'grid_manager', 'work_grassroots_issue_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('b6c249ce80d266330556e3e9463730b6', 'grid_manager', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:15', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:15'); -INSERT INTO `role_operation_default` VALUES ('b7b35eff5a8e9e977cdf979ae609fe48', 'staff', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:47'); -INSERT INTO `role_operation_default` VALUES ('b8356312c6999e7991f02ba7a36ccd68', 'manager', 'org_grid_update', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:21', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:22:21'); -INSERT INTO `role_operation_default` VALUES ('bb3f3874830982698791478ef82cf233', 'manager', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:28', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:28'); -INSERT INTO `role_operation_default` VALUES ('be06dcc0739db05e60f4c7645f209113', 'grid_member', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:18'); -INSERT INTO `role_operation_default` VALUES ('be65b3e97f6e7ec14324cd21a4650209', 'grid_party_director', 'work_grassroots_group_audit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:52', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:52'); -INSERT INTO `role_operation_default` VALUES ('bebe06a5a9e581b84b7a7fb65c711927', 'staff', 'work_party_voice_operation_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:36', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:53:36'); -INSERT INTO `role_operation_default` VALUES ('c018464eeb15d7f83ff65043c229cdc2', 'grid_party_director', 'work_grassroots_issue_closed_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:01', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:01'); -INSERT INTO `role_operation_default` VALUES ('c1b2515e5c37068a963c503bdfb2b9dd', 'grid_manager', 'work_grassroots_group_groupsinthegrid', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('c3d37d36c58e5a729b640ada67f609a6', 'manager', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:45', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:45'); -INSERT INTO `role_operation_default` VALUES ('c4edf32b0b7a2f7eaaf224d7b6e4ac49', 'party_principals', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:44'); -INSERT INTO `role_operation_default` VALUES ('c5526dbf71b708a57e7d8a31be66fdf5', 'grid_party_director', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:15:01'); -INSERT INTO `role_operation_default` VALUES ('c6617e17d269b96ea2e01a0c290d5f54', 'grid_party_director', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:22'); -INSERT INTO `role_operation_default` VALUES ('c68db11617923bc6c7e30948aaebcc47', 'agency_leader', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:11'); -INSERT INTO `role_operation_default` VALUES ('c693cf1da62b18e85660a453f0225f47', 'grid_manager', 'work_grassroots_party_branch_delete', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:26', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:19:26'); -INSERT INTO `role_operation_default` VALUES ('c7083159775af83627fa413b11df6902', 'party_principals', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:13'); -INSERT INTO `role_operation_default` VALUES ('c74f706ab5aa54a1e9f6059aeed6724b', 'dept_leader', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:33', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:08:33'); -INSERT INTO `role_operation_default` VALUES ('c7c308280a8a46f82bc27527095c7d0e', 'grid_party_director', 'work_partyauth_auditedlist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:50', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:50'); -INSERT INTO `role_operation_default` VALUES ('c89576a8ab0f7fd9602a0e3071c1505c', 'grid_party_director', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:50', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:46:50'); -INSERT INTO `role_operation_default` VALUES ('c8acf604e97386f8bf2246c051039e7b', 'dept_leader', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:20'); -INSERT INTO `role_operation_default` VALUES ('c9af4b9ef83ee6d1f638f1b1a9c7f138', 'dept_leader', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:18', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:18'); -INSERT INTO `role_operation_default` VALUES ('c9f97b4c7c98cae78317680d4480ea9b', 'party_principals', 'work_grassroots_resi_warmhearted_apply_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-22 09:54:22'); -INSERT INTO `role_operation_default` VALUES ('cb0f3a113191dd1f27a78b249283b57f', 'grid_member', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:21', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:21'); -INSERT INTO `role_operation_default` VALUES ('cb130ffc188c570f3aed8e16718d61e4', 'grid_member', 'work_grassroots_group_audited', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:15', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:15'); -INSERT INTO `role_operation_default` VALUES ('cb34dff328e0b770e293ef687d4332bd', 'agency_leader', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:42:01'); -INSERT INTO `role_operation_default` VALUES ('cc3c62876c3cfa124b73d531f668dc26', 'agency_leader', 'work_project_trace_pending_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:24:01'); -INSERT INTO `role_operation_default` VALUES ('ccf7dac4341e0a7220c8e9cb78a6a018', 'grid_party_director', 'work_grassroots_party_member_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:50', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:50'); -INSERT INTO `role_operation_default` VALUES ('cd91b28d573a7b2db5e7daf85a6f78f5', 'grid_manager', 'work_grassroots_party_member_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('d0cecb47cf834f4cfdd7bf14f49a2b6b', 'manager', 'org_staff_create', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:19', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:44:19'); -INSERT INTO `role_operation_default` VALUES ('d1595a49377fe11476129c3e7bd20746', 'grid_manager', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:07', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:07'); -INSERT INTO `role_operation_default` VALUES ('d26e14c97ded69847366c4ffbc1de009', 'staff', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:35', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:28:35'); -INSERT INTO `role_operation_default` VALUES ('d5201099c5d29f6f9083899626b731a4', 'party_principals', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:36', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:50:36'); -INSERT INTO `role_operation_default` VALUES ('d641ca48eb1460f2de9697ea0ff72fb5', 'party_principals', 'work_party_voice_offline_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:05', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:00:05'); -INSERT INTO `role_operation_default` VALUES ('d6a055d97ad1b4c137bd4640bc516183', 'manager', 'org_staff_update', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:39', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:39'); -INSERT INTO `role_operation_default` VALUES ('d6e029e17b0a6902fd6e1806b1d89db5', 'grid_manager', 'work_grassroots_group_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('d8195479b23cc54b7e17a50e8e8e84f5', 'grid_manager', 'work_grassroots_issue_shift_project', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:07', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:07'); -INSERT INTO `role_operation_default` VALUES ('d8a782b328b46d709ab2b21b1e847611', 'grid_party_director', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:30', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:30'); -INSERT INTO `role_operation_default` VALUES ('d93782eddebb094124e07f726b7fa28f', 'grid_manager', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:22', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:22'); -INSERT INTO `role_operation_default` VALUES ('da68d76c5d43dd5d9e2fbf96cdaa0877', 'party_principals', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:03'); -INSERT INTO `role_operation_default` VALUES ('ddf7f6f79435d0b764fbd861047f256f', 'grid_party_director', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:27', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:27'); -INSERT INTO `role_operation_default` VALUES ('de6ff59aeb85ef82f34886db86a38140', 'grid_party_director', 'work_partyauth_auditing_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:35:31'); -INSERT INTO `role_operation_default` VALUES ('e07fdaab4762fe38346bc1144e56dc83', 'manager', 'org_staff_forbidden', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:49', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:11:49'); -INSERT INTO `role_operation_default` VALUES ('e0c599352c9ab1b2e9943f2d39e963ee', 'grid_party_director', 'work_grassroots_party_member_edit', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:53', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:31:53'); -INSERT INTO `role_operation_default` VALUES ('e10cb46de3cc3acaaea9415328e18c58', 'manager', 'org_department_create', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:23', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:16:23'); -INSERT INTO `role_operation_default` VALUES ('e14fd6aebcf8a1baa14c70d522082894', 'agency_leader', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:04', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:20:04'); -INSERT INTO `role_operation_default` VALUES ('e3e8348ffe1d3e77189bc80e96b031b7', 'grid_party_director', 'work_grassroots_issue_voting_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:55', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:32:55'); -INSERT INTO `role_operation_default` VALUES ('e5fabe6f2620a44c1fdd23cd39e6cd18', 'grid_party_director', 'work_grassroots_party_branch_add', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:22', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:22'); -INSERT INTO `role_operation_default` VALUES ('e64f692b01171357475a543e524fa289', 'staff', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:34'); -INSERT INTO `role_operation_default` VALUES ('e77b03c4f895c29b0c3c5e43db410165', 'grid_party_director', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:13', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:41:13'); -INSERT INTO `role_operation_default` VALUES ('e7da06cf70973dde748efe7eca8b3742', 'dept_leader', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:09', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:09'); -INSERT INTO `role_operation_default` VALUES ('ea2dc4e8c769103ef80944fd0903614c', 'manager', 'org_subagency_create', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:46', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:10:46'); -INSERT INTO `role_operation_default` VALUES ('eb0044f7b0d9be2ed9f7ad44c4b5dab6', 'grid_member', 'work_grassroots_group_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:23', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:37:23'); -INSERT INTO `role_operation_default` VALUES ('eb394273fcc4d7cf5975bbbf89309845', 'agency_leader', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:11', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:11'); -INSERT INTO `role_operation_default` VALUES ('ec0659b748c56bf3167aae20d2bd7752', 'grid_party_director', 'work_grassroots_issue_shift_project', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:14', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:21:14'); -INSERT INTO `role_operation_default` VALUES ('ed69d70798bbacf9a8f5299397694793', 'agency_leader', 'work_party_voice_published_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:49:44'); -INSERT INTO `role_operation_default` VALUES ('ed9216aa608eeec22377526dfd0f4fc3', 'staff', 'work_project_trace_close', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:03', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:57:03'); -INSERT INTO `role_operation_default` VALUES ('ee4043b879abaf0998acbc05eeaabe0e', 'grid_party_director', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:04:20'); -INSERT INTO `role_operation_default` VALUES ('f03909c46a72eba529d18b138f5dc8e4', 'party_principals', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:20'); -INSERT INTO `role_operation_default` VALUES ('f0d8aaaaedeaeceff0e5d1f1bb4be799', 'manager', 'org_department_staff_remove', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:17:06', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:17:06'); -INSERT INTO `role_operation_default` VALUES ('f1e8123660f43c8160b1ac90784d33f1', 'grid_party_director', 'work_grassroots_issue_close', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:07', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:07'); -INSERT INTO `role_operation_default` VALUES ('f221dd183e1dd400b1c20217208159b9', 'grid_member', 'work_grassroots_resi_warmhearted_apply_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:13', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:22:13'); -INSERT INTO `role_operation_default` VALUES ('f2574066107e80d9f6c5043aef7a4838', 'grid_member', 'work_partyauth_audited_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:38:12'); -INSERT INTO `role_operation_default` VALUES ('f2b3c56a87050aaf87064a1c4d269e09', 'party_principals', 'org_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:40:20'); -INSERT INTO `role_operation_default` VALUES ('f2fe0911fc733229a9fd5c514cc88f26', 'manager', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:16', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:16'); -INSERT INTO `role_operation_default` VALUES ('f427cfe35a55d84fafc9ebbf05b0b8bd', 'grid_manager', 'work_project_trace_involved_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:43', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:02:43'); -INSERT INTO `role_operation_default` VALUES ('f4b7ed10e0d4e1bef2eae1f7e4baf4bb', 'grid_member', 'work_project_trace_transfer', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:38', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:48:38'); -INSERT INTO `role_operation_default` VALUES ('f5bce61b3b07e26a1d7b8ef02844fb34', 'staff', 'org_grid_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:21:32'); -INSERT INTO `role_operation_default` VALUES ('f5c78ed47ef53580fd783628491af975', 'grid_member', 'work_project_trace_created_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:32', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:29:32'); -INSERT INTO `role_operation_default` VALUES ('f6480fdf44c2d010dbc6a6faab5bd575', 'grid_member', 'work_party_voice_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:48', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:43:48'); -INSERT INTO `role_operation_default` VALUES ('f6648b257d13b62e56408b0c668bf4c2', 'grid_manager', 'work_grassroots_group_audited', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('f711e697eb2f0af7b10d9fc20195a828', 'staff', 'work_project_trace_return', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:54', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:03:54'); -INSERT INTO `role_operation_default` VALUES ('f7798e2175a08a997ffca8b7f10160de', 'grid_manager', 'work_grassroots_issue_close', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('f797a4f94763b660efec7c01cb687e0e', 'grid_member', 'work_grassroots_issue_shifted_project_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:05', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:40:05'); -INSERT INTO `role_operation_default` VALUES ('fa2e600ecbe4348b2aad206e17561af5', 'manager', 'work_project_trace_detail', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:20', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 14:45:20'); -INSERT INTO `role_operation_default` VALUES ('fa90970dd78fb518641287561b9f2156', 'dept_leader', 'org_agency_trace', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:01', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:06:01'); -INSERT INTO `role_operation_default` VALUES ('faf2ddb2c1ddfbf389d2a7941ee302ed', 'agency_leader', 'org_subagency_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:44', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:07:44'); -INSERT INTO `role_operation_default` VALUES ('fb05ac044d5192537b9896ce24f3b37c', 'grid_manager', 'work_grassroots_group_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('fb100a6c54ca542a75e38519c5670143', 'grid_manager', 'work_grassroots_issue_voting_list', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:26:31'); -INSERT INTO `role_operation_default` VALUES ('fce3813353120d17ba9fddcf40088e71', 'manager', 'org_grid_staff_add', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:14', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:23:14'); -INSERT INTO `role_operation_default` VALUES ('feafa26b7a539a214ba7375fec6d9d94', 'manager', 'org_department_staff_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:19:47', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:19:47'); -INSERT INTO `role_operation_default` VALUES ('fec09cf7b821f0d4ee1c46777b75f306', 'party_principals', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:25', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:12:25'); -INSERT INTO `role_operation_default` VALUES ('ff0230c8252b370d1ba258b8dbde615d', 'grid_manager', 'work_partyauth_auditedlist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:26', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:23:26'); -INSERT INTO `role_operation_default` VALUES ('ff92545c692a0fb90f5ec4d38a5ad7e0', 'grid_party_director', 'work_partyauth_audited_detail', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:32', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:33:32'); -INSERT INTO `role_operation_default` VALUES ('ff9ac6495fb0bf283bc8a4a5ed9ff7b6', 'staff', 'org_department_list', 0, 0, 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:34', 'f79436ae8df2eb4bcd956b00425511ce', '2020-06-20 15:14:34'); -INSERT INTO `role_operation_default` VALUES ('ffd9c0ce95c74464b94ec88ede0aa6e1', 'grid_party_director', 'work_grassroots_resi_warmhearted_auditinglist', 0, 0, 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:12', 'ae867bb9d5c2760b3f090f3e3bcdf4c7', '2020-06-22 10:34:12'); -COMMIT; - --- ---------------------------- --- Table structure for role_scope --- ---------------------------- -DROP TABLE IF EXISTS `role_scope`; -CREATE TABLE `role_scope` ( - `ID` varchar(64) NOT NULL, - `ROLE_ID` varchar(64) NOT NULL COMMENT '角色ID', - `OPERATION_KEY` varchar(64) NOT NULL COMMENT '操作key', - `SCOPE_KEY` varchar(30) NOT NULL COMMENT '范围Key', - `DEL_FLAG` tinyint(1) DEFAULT NULL COMMENT '是否删除，0：未删除，1：已删除', - `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建者id', - `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新者id', - `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='角色能操作哪些范围'; - -SET FOREIGN_KEY_CHECKS = 1; +select 0; \ No newline at end of file diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml index a08cd1f375..c716cc0239 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.56 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.57 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml index 2289a27ce8..464e41c8e3 100644 --- a/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml +++ b/epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-voice-server: container_name: gov-voice-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.56 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/gov-voice-server:0.3.57 ports: - "8105:8105" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-voice/gov-voice-server/pom.xml b/epmet-module/gov-voice/gov-voice-server/pom.xml index 3e684e0f72..91548839b7 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.56 + 0.3.57 gov-voice com.epmet diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__add_gridIds.sql b/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__add_gridIds.sql deleted file mode 100644 index 09b724ce63..0000000000 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/db/migration/V0.0.2__add_gridIds.sql +++ /dev/null @@ -1,3 +0,0 @@ -ALTER TABLE `epmet_gov_voice`.`article_operate_record` -ADD COLUMN `GRID_IDS` varchar(1024) NULL DEFAULT NULL COMMENT '网格ID，下线文章时，多个以英文:隔开' AFTER `ARTICLE_ID`, -MODIFY COLUMN `OP_TYPE` varchar(32) NOT NULL COMMENT '操作类型 发布文章：publish；取消文章置顶：canceltop；设置置顶：settop；下线文章：offline；修改文章发布范围：updatepublishrange' AFTER `CONTENT`; \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index c700a7b085..1574e7f53e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.50 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.51 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml index 4eaf11b7e0..344f01b1f1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.50 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.51 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index b7715679a3..c50af5590b 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.50 + 0.3.51 com.epmet resi-partymember diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql deleted file mode 100644 index a91d0feea2..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.2__partybranch.sql +++ /dev/null @@ -1,31 +0,0 @@ -CREATE TABLE `partymember_auth_record` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `PARTYMEMBER_BASE_INFO_ID` varchar(64) NOT NULL COMMENT 'partymember_base_info.id', - `USER_ID` varchar(64) NOT NULL COMMENT '认证居民id', - `AUTH_TIME` datetime NOT NULL COMMENT '认证时间(和partymember_info表时间一致)', - `GRID_ID` varchar(64) NOT NULL COMMENT '认证网格id', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '认证客户id', - `AUTH_DESC` varchar(255) NOT NULL COMMENT '认证的描述：账户于2020年10月30号在海泊桥社区-第一网格激活', - `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', - `REVISION` int(10) NOT NULL 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`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党员认证记录表'; - - - -CREATE TABLE `party_branch_members` ( - `ID` varchar(64) NOT NULL COMMENT '主键', - `BRANCH_ID` varchar(64) NOT NULL COMMENT '党支部id，customer_party_branch.id', - `PARTYMEMBER_BASE_INFO_ID` varchar(64) NOT NULL COMMENT '党员库表主键,partymember_base_info.id', - `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', - `REVISION` int(10) NOT NULL 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`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党支部党员关系表'; \ No newline at end of file From 0eee56cbf79bfb2f2c4942ab7fe8e00f66a4d11a Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 23 Jun 2020 14:08:57 +0800 Subject: [PATCH 13/34] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=B0=8F=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/constant/GroupConstant.java | 4 +++ .../result/GridIdListByCustomerResultDTO.java | 25 ++++++++++++++ .../com/epmet/dao/org/CustomerGridDao.java | 3 +- .../epmet/service/group/GroupDataService.java | 3 +- .../group/impl/GroupDataServiceImpl.java | 4 +-- .../service/impl/StatsGroupServiceImpl.java | 33 +++++++++++++------ .../service/org/CustomerGridService.java | 3 +- .../org/impl/CustomerGridServiceImpl.java | 3 +- .../resources/mapper/org/CustomerGridDao.xml | 5 +-- 9 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/result/GridIdListByCustomerResultDTO.java diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java index 255b463cdb..f7eccf24b1 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/GroupConstant.java @@ -29,4 +29,8 @@ public interface GroupConstant { String CITY = "city"; String PROVINCE = "province"; + String ERRORGRIDDAILY = "groupGridDaily ==>【网格小组统计出错了... 维度：网格-日】customerId为："; + + String ERRORAGENCYDAILY = "groupAgencyDaily ==>【网格小组统计出错了... 维度：机关-日】customerId为："; + } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/result/GridIdListByCustomerResultDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/result/GridIdListByCustomerResultDTO.java new file mode 100644 index 0000000000..4c2f1033c7 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/result/GridIdListByCustomerResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.group.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @CreateTime 2020/6/23 13:54 + */ +@Data +public class GridIdListByCustomerResultDTO implements Serializable { + + private static final long serialVersionUID = -4170349451726088582L; + + /** + * 网格ID + */ + private String GridId; + + /** + * 机关ID + */ + private String agencyId; +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java index 846dde48e8..faccf553a2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/CustomerGridDao.java @@ -20,6 +20,7 @@ package com.epmet.dao.org; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.group.AgencyDTO; import com.epmet.dto.group.result.AgencyGridTotalCountResultDTO; +import com.epmet.dto.group.result.GridIdListByCustomerResultDTO; import com.epmet.entity.org.CustomerGridEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -57,5 +58,5 @@ public interface CustomerGridDao extends BaseDao { * @param dateId * @author zxc */ - List getCustomerGridIdList(@Param("customerId") String customerId, @Param("dateId") String dateId); + List getCustomerGridIdList(@Param("customerId") String customerId, @Param("dateId") String dateId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java index be00cca1dd..a6d61a756e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/GroupDataService.java @@ -1,7 +1,6 @@ package com.epmet.service.group; import com.epmet.dto.group.result.*; -import com.epmet.entity.stats.DimGridEntity; import com.epmet.util.DimIdGenerator; import org.apache.ibatis.annotations.Param; @@ -18,7 +17,7 @@ public interface GroupDataService { * @param customerId * @author zxc */ - List groupGridDaily(String customerId, DimIdGenerator.DimIdBean dimIdBean, List gridsInfo); + List groupGridDaily(String customerId, DimIdGenerator.DimIdBean dimIdBean, List gridsInfo); /** * @Description 获取同级机关下网格下的小组数量 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java index 0aa22e72ec..1cdc3acdcf 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java @@ -36,7 +36,7 @@ public class GroupDataServiceImpl implements GroupDataService { * @author zxc */ @Override - public List groupGridDaily(String customerId, DimIdGenerator.DimIdBean dimTime, List gridsInfo) { + public List groupGridDaily(String customerId, DimIdGenerator.DimIdBean dimTime, List gridsInfo) { List result = new ArrayList<>(); if (gridsInfo.size() == NumConstant.ZERO){ return new ArrayList<>(); @@ -46,7 +46,7 @@ public class GroupDataServiceImpl implements GroupDataService { GroupGridDailyResultDTO dailyResult = new GroupGridDailyResultDTO(); BeanUtils.copyProperties(dimTime,dailyResult); dailyResult.setAgencyId(grid.getAgencyId()); - dailyResult.setGridId(grid.getId()); + dailyResult.setGridId(grid.getGridId()); dailyResult.setCustomerId(customerId); result.add(dailyResult); }); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index e4447e07ba..f91f0124b4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -1,18 +1,19 @@ package com.epmet.service.impl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.constant.GroupConstant; import com.epmet.dto.AgencySubTreeDto; import com.epmet.dto.group.form.AgencyMonthlyFormDTO; import com.epmet.dto.group.result.*; import com.epmet.dto.stats.DimAgencyDTO; import com.epmet.entity.stats.DimAgencyEntity; -import com.epmet.entity.stats.DimGridEntity; import com.epmet.service.StatsGroupService; import com.epmet.service.group.GroupDataService; import com.epmet.service.org.CustomerGridService; import com.epmet.service.stats.*; import com.epmet.util.DimIdGenerator; import com.epmet.util.ModuleConstant; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -30,6 +31,7 @@ import java.util.stream.Collectors; * @CreateTime 2020/6/16 14:14 */ @Service +@Slf4j public class StatsGroupServiceImpl implements StatsGroupService { @Autowired @@ -63,10 +65,17 @@ public class StatsGroupServiceImpl implements StatsGroupService { customerIds = dimCustomerService.selectCustomerIdPage(pageNo,pageSize); if (customerIds.size() != NumConstant.ZERO){ customerIds.forEach(customerId -> { - DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); - List gridsInfo = dimGridService.getGridListByCustomerId(customerId); - List resultDTOS = groupDataService.groupGridDaily(customerId,dimIdBean,gridsInfo); - factGroupGridDailyService.statisticsGroupGridDaily(resultDTOS,customerId); + try { + DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); + +// List gridsInfo = dimGridService.getGridListByCustomerId(customerId); + List gridsInfo = customerGridService.getCustomerGridIdList(customerId, dimIdBean.getDateId()); + + List resultDTOS = groupDataService.groupGridDaily(customerId,dimIdBean,gridsInfo); + factGroupGridDailyService.statisticsGroupGridDaily(resultDTOS,customerId); + } catch (Exception e) { + log.error(GroupConstant.ERRORGRIDDAILY+customerId,e); + } }); } @@ -87,9 +96,13 @@ public class StatsGroupServiceImpl implements StatsGroupService { if (customerIds.size() != NumConstant.ZERO){ DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(date); customerIds.forEach(customerId -> { - List customerAgencyInfos = dimAgencyService.getAgencyInfoByCustomerId(customerId); - List agencyGroupDaily = this.getAgencyGroupDaily(customerAgencyInfos, dimIdBean, customerId); - factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily,customerId); + try { + List customerAgencyInfos = dimAgencyService.getAgencyInfoByCustomerId(customerId); + List agencyGroupDaily = this.getAgencyGroupDaily(customerAgencyInfos, dimIdBean, customerId); + factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily,customerId); + } catch (Exception e) { + log.error(GroupConstant.ERRORAGENCYDAILY+customerId,e); + } }); } }while (customerIds.size() != NumConstant.ZERO && customerIds.size() == pageSize); @@ -139,12 +152,12 @@ public class StatsGroupServiceImpl implements StatsGroupService { String pidByAgencyId = dimAgencyService.getPidByAgencyId(agencyId); agencyResult.setPid(StringUtils.isBlank(pidByAgencyId)?"0":pidByAgencyId); // TODO 1. 机关下有多少网格 - List customerGridIdList = customerGridService.getCustomerGridIdList(customerId, dateId); + List customerGridIdList = customerGridService.getCustomerGridIdList(customerId, dateId); AtomicReference gridSize = new AtomicReference<>(0); if (customerGridIdList.size() != NumConstant.ZERO){ customerGridIdList.forEach(gridId -> { allGrid.forEach(allAgencyGrid -> { - if (gridId.equals(allAgencyGrid)){ + if (gridId.getGridId().equals(allAgencyGrid)){ gridSize.updateAndGet(v -> v + NumConstant.ONE); } }); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java index cd82c81628..00b46e8b75 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerGridService.java @@ -2,6 +2,7 @@ package com.epmet.service.org; import com.epmet.dto.group.AgencyDTO; import com.epmet.dto.group.result.AgencyGridTotalCountResultDTO; +import com.epmet.dto.group.result.GridIdListByCustomerResultDTO; import com.epmet.entity.org.CustomerGridEntity; import java.util.Date; @@ -30,5 +31,5 @@ public interface CustomerGridService { * @param dateId * @author zxc */ - List getCustomerGridIdList(String customerId,String dateId); + List getCustomerGridIdList(String customerId, String dateId); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java index d3e7a51087..fc95a3de29 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java @@ -5,6 +5,7 @@ import com.epmet.constant.DataSourceConstant; import com.epmet.dao.org.CustomerGridDao; import com.epmet.dto.group.AgencyDTO; import com.epmet.dto.group.result.AgencyGridTotalCountResultDTO; +import com.epmet.dto.group.result.GridIdListByCustomerResultDTO; import com.epmet.entity.org.CustomerGridEntity; import com.epmet.service.org.CustomerGridService; import org.springframework.beans.factory.annotation.Autowired; @@ -42,7 +43,7 @@ public class CustomerGridServiceImpl implements CustomerGridService { * @author zxc */ @Override - public List getCustomerGridIdList(String customerId, String dateId) { + public List getCustomerGridIdList(String customerId, String dateId) { return customerGridDao.getCustomerGridIdList(customerId, dateId); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml index 0eb2f74b45..6a5253e473 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml @@ -36,9 +36,10 @@ - SELECT - id AS gridId + id AS gridId, + pid AS agencyId FROM customer_grid WHERE From 4c47e291ba07743e3a65227f7f109da4f11481fa Mon Sep 17 00:00:00 2001 From: jiangyuying Date: Tue, 23 Jun 2020 14:56:19 +0800 Subject: [PATCH 14/34] =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E8=83=BD=E5=8A=9B--NEI?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/FactPublishedAgencyDTO.java | 20 ++- .../result/FactPublishedAgencyDailyDTO.java | 86 +-------- .../result/FactPublishedDepartmentDTO.java | 2 +- .../dto/result/FactPublishedGridDTO.java | 2 +- .../publicity/PublicityController.java | 44 ++++- .../com/epmet/dao/publicity/PublicityDao.java | 64 ++++++- .../service/publicity/PublicityService.java | 26 ++- .../publicity/impl/PublicityServiceImpl.java | 105 +++++++++-- .../mapper/publicity/PublicityDao.xml | 165 +++++++++++++++++- 9 files changed, 403 insertions(+), 111 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java index 6d1144a2c8..9357d45f2d 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDTO.java @@ -33,21 +33,29 @@ public class FactPublishedAgencyDTO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 机关名称 + */ + private String name; + /** + * 发文数量 + */ + private Integer value; /** - * 累计发文总数 + * 固定值：文章数量 */ - private Integer publishedTotal; + private String type="文章数量"; /** - * 发布中的文章总数 + * 机关Id */ - private Integer publishingTotal; + private String agencyId; /** - * 数据截止日期 + * 上级机关Id */ - private String dateName; + private String pid; } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java index 50f07bcb8f..02eb3446a7 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedAgencyDailyDTO.java @@ -17,13 +17,13 @@ package com.epmet.publicity.dto.result; -import java.io.Serializable; -import java.util.Date; import lombok.Data; +import java.io.Serializable; + /** - * 文章发布数量【机关】日统计表 + * 文章发表数量—下级机关统计 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-06-19 @@ -33,89 +33,21 @@ public class FactPublishedAgencyDailyDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * ID ID - */ - private String id; - - /** - * 客户ID 客户ID - */ - private String customerId; - - /** - * 上级机关ID 上级机关ID - */ - private String pid; - - /** - * 机关ID - */ - private String agencyId; - - /** - * 文章累计发文数量 文章数量 - */ - private Integer articleTotalCount; /** - * 当前发文数量 当前未下线的文章数量 + * 累计发文总数 */ - private Integer articlePublishedCount; + private Integer publishedTotal; /** - * 日期ID 日期ID + * 发布中的文章总数 */ - private String dateId; + private Integer publishingTotal; /** - * 周ID 周ID eg：2020W01 = 2020年第一周 + * 数据截止日期 */ - private String weekId; + private String dateName; - /** - * 月份ID 月份ID eg：202006 = 2020年6月、2020-07 = 2020年7月 - */ - private String monthId; - - /** - * 季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度 - */ - private String quarterId; - - /** - * 年度ID 年度ID eg：2020 = 2020年、2021 = 2021年 - */ - private String yearId; - - /** - * 删除状态 - */ - private Integer delFlag; - - /** - * 乐观锁 - */ - private Integer revision; - - /** - * 创建人 - */ - private String createdBy; - - /** - * 创建时间 - */ - private Date createdTime; - - /** - * 更新人 - */ - private String updatedBy; - - /** - * 更新时间 - */ - private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java index bc26c9fb50..11aa1e2cea 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedDepartmentDTO.java @@ -34,7 +34,7 @@ public class FactPublishedDepartmentDTO implements Serializable { private static final long serialVersionUID = 1L; /** - * 机关名称 + * 部门名称 */ private String name; diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java index ad8a3e6c9e..909deb2ba4 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactPublishedGridDTO.java @@ -34,7 +34,7 @@ public class FactPublishedGridDTO implements Serializable { private static final long serialVersionUID = 1L; /** - * 机关名称 + * 网格名称 */ private String name; diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java index 9f64bec3e4..56d31b9d17 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/controller/publicity/PublicityController.java @@ -23,11 +23,13 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.publicity.dto.form.TagFormDTO; -import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO; -import com.epmet.publicity.dto.result.FactTagAgencyDTO; +import com.epmet.publicity.dto.result.*; import com.epmet.service.publicity.PublicityService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -91,4 +93,40 @@ public class PublicityController { return new Result>().ok(publicityService.tagused(tokenDto, pageSize, type)); } + /** + * @param tokenDto 登录者token + * @Description 获取下级机关发文数 + * @author jyy + */ + @PostMapping("subagency/publishedarticle") + public Result> subagencyPublishedarticle(@LoginUser TokenDto tokenDto, @RequestBody TagFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, TagFormDTO.GroupJava.class); + String type = formDTO.getType(); + return new Result>().ok(publicityService.subagencyPublishedarticle(tokenDto, type)); + } + + /** + * @param tokenDto 登录者token + * @Description 获取直属部门发文数 + * @author jyy + */ + @PostMapping("department/publishedarticle") + public Result> departmentPublishedarticle(@LoginUser TokenDto tokenDto, @RequestBody TagFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, TagFormDTO.GroupJava.class); + String type = formDTO.getType(); + return new Result>().ok(publicityService.departmentPublishedarticle(tokenDto, type)); + } + + /** + * @param tokenDto 登录者token + * @Description 获取指数网格发文数 + * @author jyy + */ + @PostMapping("subgrid/publishedarticle") + public Result> subgridPublishedarticle(@LoginUser TokenDto tokenDto, @RequestBody TagFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, TagFormDTO.GroupJava.class); + String type = formDTO.getType(); + return new Result>().ok(publicityService.subgridPublishedarticle(tokenDto, type)); + } + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java index aa2475e2c5..33801156b9 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/dao/publicity/PublicityDao.java @@ -17,8 +17,7 @@ package com.epmet.dao.publicity; -import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO; -import com.epmet.publicity.dto.result.FactTagAgencyDTO; +import com.epmet.publicity.dto.result.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -81,5 +80,66 @@ public interface PublicityDao { * @author zxc */ List getUsedYearlyCountByTag(@Param("agencyId") String agencyId, @Param("yearId") String yearId, @Param("pageSize") Integer pageSize); + + /** + * @Description 当月———下级机发文数 + * @param agencyId,monthId 机关id，月 + * @author zxc + */ + List getSubAgencyPublishedMonth(@Param("agencyId") String agencyId, @Param("monthId") String monthId); + + /** + * @Description 当季———下级机发文数 + * @param agencyId,quarterId 机关id，季度 + * @author zxc + */ + List getSubAgencyPublishedQuarter(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId); + /** + * @Description 当年———下级机发文数 + * @param agencyId,yearId 机关id，年 + * @author zxc + */ + List getSubAgencyPublishedYear(@Param("agencyId") String agencyId, @Param("yearId") String yearId); + + /** + * @Description 当月———下级部门文数 + * @param agencyId,monthId 机关id，月 + * @author zxc + */ + List getSubDepartPublishedMonth(@Param("agencyId") String agencyId, @Param("monthId") String monthId); + + /** + * @Description 当季———下级部门文数 + * @param agencyId,quarterId 机关id，季度 + * @author zxc + */ + List getSubDepartPublishedQuarter(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId); + /** + * @Description 当年———下级部门文数 + * @param agencyId,yearId 机关id，年 + * @author zxc + */ + List getSubDepartPublishedYear(@Param("agencyId") String agencyId, @Param("yearId") String yearId); + + /** + * @Description 当月———下级网格文数 + * @param agencyId,monthId 机关id，月 + * @author zxc + */ + List getSubGridPublishedMonth(@Param("agencyId") String agencyId, @Param("monthId") String monthId); + + /** + * @Description 当季———下级网格文数 + * @param agencyId,quarterId 机关id，季度 + * @author zxc + */ + List getSubGridPublishedQuarter(@Param("agencyId") String agencyId, @Param("quarterId") String quarterId); + /** + * @Description 当年———下级网格文数 + * @param agencyId,yearId 机关id，年 + * @author zxc + */ + List getSubGridPublishedYear(@Param("agencyId") String agencyId, @Param("yearId") String yearId); + } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java index e79ed8c1d5..9eccb5b29f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/PublicityService.java @@ -18,9 +18,12 @@ package com.epmet.service.publicity; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO; -import com.epmet.publicity.dto.result.FactTagAgencyDTO; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.publicity.dto.result.*; +import org.apache.commons.lang3.StringUtils; +import java.util.Date; import java.util.List; /** @@ -52,5 +55,24 @@ public interface PublicityService { */ public List tagused(TokenDto tokenDto, Integer pageSize, String type) ; + /** + * @param tokenDto type + * @Description 获取下级机关发文数 + * @author jyy + */ + public List subagencyPublishedarticle(TokenDto tokenDto, String type) ; + /** + * @param tokenDto type + * @Description 获取直属部门发文数 + * @author jyy + */ + public List departmentPublishedarticle(TokenDto tokenDto, String type); + + /** + * @param tokenDto type + * @Description 获取指数网格发文数 + * @author jyy + */ + public List subgridPublishedarticle(TokenDto tokenDto, String type); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java index e65b569d23..10f19b3ea0 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java @@ -19,15 +19,11 @@ package com.epmet.service.publicity.impl; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.dao.publicity.PublicityDao; import com.epmet.dto.form.LoginUserDetailsFormDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.feign.EpmetUserOpenFeignClient; - - -import com.epmet.dao.publicity.PublicityDao; -import com.epmet.publicity.dto.result.FactPublishedAgencyDailyDTO; - -import com.epmet.publicity.dto.result.FactTagAgencyDTO; +import com.epmet.publicity.dto.result.*; import com.epmet.service.publicity.PublicityService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -65,7 +61,7 @@ public class PublicityServiceImpl implements PublicityService { /** * @param tokenDto,formDTO - * @Description 宣传能力—工作端—宣传能力-获取阅读最多的分类数据 + * @Description 宣传能力—工作端-获取阅读最多的分类数据 * @author jyy */ @Override @@ -81,23 +77,20 @@ public class PublicityServiceImpl implements PublicityService { return publicityDao.getViewedMonthlyCountByTag(agencyId, monthId, pageSize); } else if (StringUtils.equals("quarter", type)) {//当季 - String quarterId = strDate + "Q" + DateUtils.getQuarterIndex(date); + String quarterId = yearId + "Q" + DateUtils.getQuarterIndex(date); return publicityDao.getViewedQuarterlyCountByTag(agencyId, quarterId, pageSize); } else if (StringUtils.equals("year", type)) {//当年 - return publicityDao.getViewedYearlyCountByTag(agencyId, yearId, pageSize); } else { return null; } - - } /** * @param tokenDto pageSize type - * @Description 宣传能力—工作端—宣传能力-获取发表最多的分类数据 + * @Description 宣传能力—工作端-获取发表最多的分类数据 * @author jyy */ @Override @@ -113,18 +106,102 @@ public class PublicityServiceImpl implements PublicityService { return publicityDao.getUsedMonthlyCountByTag(agencyId, monthId, pageSize); } else if (StringUtils.equals("quarter", type)) {//当季 - String quarterId = strDate + "Q" + DateUtils.getQuarterIndex(date); + String quarterId = yearId + "Q" + DateUtils.getQuarterIndex(date); return publicityDao.getUsedQuarterlyCountByTag(agencyId, quarterId, pageSize); } else if (StringUtils.equals("year", type)) {//当年 - return publicityDao.getUsedYearlyCountByTag(agencyId, yearId, pageSize); } else { return null; } + } + + /** + * @param tokenDto type + * @Description 获取下级机关发文数 + * @author jyy + */ + @Override + public List subagencyPublishedarticle(TokenDto tokenDto, String type) { +// String agencyId = this.getLoginUserDetails(tokenDto); + String agencyId = "1041fe5e8499dbd8add314291d2f6da4"; + Date date = new Date(); + String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD); + String yearId = strDate.substring(0, 4); + String monthId = strDate.substring(0, 6); + + if (StringUtils.equals("month", type)) {//当月 + return publicityDao.getSubAgencyPublishedMonth(agencyId, monthId); + + } else if (StringUtils.equals("quarter", type)) {//当季 + String quarterId = yearId + "Q" + DateUtils.getQuarterIndex(date); + return publicityDao.getSubAgencyPublishedQuarter(agencyId, quarterId); + + } else if (StringUtils.equals("year", type)) {//当年 + return publicityDao.getSubAgencyPublishedYear(agencyId, yearId); + + } else { + return null; + } + } + + /** + * @param tokenDto type + * @Description 获取直属部门发文数 + * @author jyy + */ + @Override + public List departmentPublishedarticle(TokenDto tokenDto, String type) { +// String agencyId = this.getLoginUserDetails(tokenDto); + String agencyId = "0d2ffe9fce682b602b9d451226d08fae"; + Date date = new Date(); + String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD); + String yearId = strDate.substring(0, 4); + String monthId = strDate.substring(0, 6); + + if (StringUtils.equals("month", type)) {//当月 + return publicityDao.getSubDepartPublishedMonth(agencyId, monthId); + + } else if (StringUtils.equals("quarter", type)) {//当季 + String quarterId = yearId + "Q" + DateUtils.getQuarterIndex(date); + return publicityDao.getSubDepartPublishedQuarter(agencyId, quarterId); + + } else if (StringUtils.equals("year", type)) {//当年 + return publicityDao.getSubDepartPublishedYear(agencyId, yearId); + + } else { + return null; + } + } + /** + * @param tokenDto type + * @Description 获取指数网格发文数 + * @author jyy + */ + @Override + public List subgridPublishedarticle(TokenDto tokenDto, String type) { +// String agencyId = this.getLoginUserDetails(tokenDto); + String agencyId = "0d2ffe9fce682b602b9d451226d08fae"; + Date date = new Date(); + String strDate = DateUtils.format(date, DateUtils.DATE_PATTERN_YYYYMMDD); + String yearId = strDate.substring(0, 4); + String monthId = strDate.substring(0, 6); + + if (StringUtils.equals("month", type)) {//当月 + return publicityDao.getSubGridPublishedMonth(agencyId, monthId); + + } else if (StringUtils.equals("quarter", type)) {//当季 + String quarterId = yearId + "Q" + DateUtils.getQuarterIndex(date); + return publicityDao.getSubGridPublishedQuarter(agencyId, quarterId); + + } else if (StringUtils.equals("year", type)) {//当年 + return publicityDao.getSubGridPublishedYear(agencyId, yearId); + } else { + return null; + } } /** diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml index 73ec0850fb..ccd4fb657e 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/publicity/PublicityDao.xml @@ -8,7 +8,7 @@ SELECT article_total_count AS publishedTotal, article_published_count AS publishingTotal, - DATE_FORMAT( date_id, '%Y-%m-%d' ) AS dateName + DATE_FORMAT( date_id, '%Y.%m.%d' ) AS dateName FROM fact_article_published_agency_daily where agency_id = #{agencyId} @@ -74,8 +74,7 @@ - SELECT tag_name AS name, agency_id AS agencyId, @@ -90,8 +89,7 @@ - SELECT tag_name AS name, agency_id AS agencyId, @@ -104,4 +102,161 @@ ORDER BY value DESC LIMIT #{pageSize} + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 2c0ee7397c4167ac65a2c70fb546ee109982d36b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 23 Jun 2020 15:09:07 +0800 Subject: [PATCH 15/34] =?UTF-8?q?=E6=95=B0=E6=8D=AE-=E9=A1=B9=E7=9B=AE-?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4=E3=80=81=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/impl/ProjectServiceImpl.java | 19 +- .../project/form/MonthProjectListFormDTO.java | 14 +- .../feign/DataStatisticalOpenFeignClient.java | 14 ++ ...ataStatisticalOpenFeignClientFallBack.java | 18 ++ .../controller/StatsProjectController.java | 23 ++- .../epmet/service/StatsProjectService.java | 10 +- .../service/impl/StatsProjectServiceImpl.java | 183 +++++++++--------- .../stats/FactAgencyProjectDailyDao.xml | 6 +- .../mapper/stats/FactGridProjectDailyDao.xml | 6 +- .../epmet/service/StatsProjectService.java | 23 +++ .../service/impl/StatsProjectServiceImpl.java | 34 ++++ .../epmet/task/StatsProjectAgencyTask.java | 32 +++ .../com/epmet/task/StatsProjectGridTask.java | 35 ++++ 13 files changed, 298 insertions(+), 119 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsProjectService.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java index 35769c0a39..1d8871803d 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java @@ -16,6 +16,9 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.text.NumberFormat; import java.util.ArrayList; import java.util.List; @@ -43,8 +46,14 @@ public class ProjectServiceImpl implements ProjectService { //2:根据agencyId查询项目统计数据 ProjectSummaryResultDTO resultDTO = projectDao.selectProjectSummary(agencyId); if (null != resultDTO) { - resultDTO.setPendingRatio(resultDTO.getPendingRatioInt().stripTrailingZeros().toString() + "%"); - resultDTO.setClosedRatio(resultDTO.getClosedRatioInt().stripTrailingZeros().toString() + "%"); + //将结果转成百分比 + NumberFormat percent = NumberFormat.getPercentInstance(); + percent.setMaximumFractionDigits(2); + //四舍五入保留小数点后四位 + BigDecimal pendingRatio = resultDTO.getPendingRatioInt().setScale(4, RoundingMode.HALF_UP); + //将小数转成百分比 + resultDTO.setPendingRatio(percent.format(pendingRatio.doubleValue())); + resultDTO.setClosedRatio(percent.format(resultDTO.getClosedRatioInt().setScale(4, RoundingMode.HALF_UP).doubleValue())); } return resultDTO; } @@ -62,8 +71,12 @@ public class ProjectServiceImpl implements ProjectService { //2:根据agencyId查询各状态统计数据 resultList = projectDao.selectSummaryInfo(agencyId); if (null != resultList && resultList.size() > NumConstant.ZERO) { + //将结果转成百分比 + NumberFormat percent = NumberFormat.getPercentInstance(); + percent.setMaximumFractionDigits(2); resultList.forEach(sum -> { - sum.setRatio(sum.getRatioInt().stripTrailingZeros().toString() + "%"); + //先四舍五入保留四位小数再把小数转成百分比 + sum.setRatio(percent.format(sum.getRatioInt().setScale(4, RoundingMode.HALF_UP).doubleValue())); }); } return resultList; diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/MonthProjectListFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/MonthProjectListFormDTO.java index 73045ccb3c..b0ff888330 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/MonthProjectListFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/project/form/MonthProjectListFormDTO.java @@ -18,6 +18,10 @@ public class MonthProjectListFormDTO implements Serializable { * 客户Id */ private String customerId; + /** + * 月维度Id + */ + private String monthId; /** * 机关Id @@ -29,14 +33,4 @@ public class MonthProjectListFormDTO implements Serializable { */ private String gridId; - /** - * 起始时间 - */ - private Date startTime; - - /** - * 结束时间 - */ - private Date endTime; - } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/DataStatisticalOpenFeignClient.java index 01c9953043..3b914706b7 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/DataStatisticalOpenFeignClient.java @@ -104,4 +104,18 @@ public interface DataStatisticalOpenFeignClient { @PostMapping("/data/stats/statsgroup/groupagencymonthly") Result groupAgencyMonthly(); + /** + * @Description 数据统计-项目-机关日月统计 + * @Author sun + */ + @PostMapping("/data/stats/statsproject/agencyprojectstats") + Result agencyProjectStats(); + + /** + * @Description 数据统计-项目-网格日月统计 + * @Author sun + */ + @PostMapping("/data/stats/statsproject/gridprojectstats") + Result gridProjectStats(); + } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/impl/DataStatisticalOpenFeignClientFallBack.java index 1ccec983eb..4cd8be3729 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/impl/DataStatisticalOpenFeignClientFallBack.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/impl/DataStatisticalOpenFeignClientFallBack.java @@ -109,4 +109,22 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp public Result groupAgencyMonthly() { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "groupAgencyMonthly"); } + + /** + * @Description 数据统计-项目-机关日月统计 + * @Author sun + */ + @Override + public Result agencyProjectStats() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "agencyProjectStats"); + } + + /** + * @Description 数据统计-项目-网格日月统计 + * @Author sun + */ + @Override + public Result gridProjectStats() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "gridProjectStats"); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsProjectController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsProjectController.java index 7d6c958d66..0b1bd0eb47 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsProjectController.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsProjectController.java @@ -1,10 +1,11 @@ package com.epmet.controller; import com.epmet.commons.tools.utils.Result; -import com.epmet.service.StatsDemoService; import com.epmet.service.StatsProjectService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 数据统计-项目 @@ -19,11 +20,21 @@ public class StatsProjectController { /** * @Author sun - * @Description 数据-项目-机关、网格日(月)统计 + * @Description 数据-项目-机关日(月)统计 **/ - @PostMapping("projectstats") - public Result agencyGridProjectStats() { - statsProjectService.agencyGridProjectStats(); + @PostMapping("agencyprojectstats") + public Result agencyProjectStats() { + statsProjectService.agencyProjectStats(); + return new Result(); + } + + /** + * @Author sun + * @Description 数据-项目-网格日(月)统计 + **/ + @PostMapping("gridprojectstats") + public Result gridProjectStats() { + statsProjectService.gridProjectStats(); return new Result(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsProjectService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsProjectService.java index 996d4c6e7d..739e69a780 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsProjectService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsProjectService.java @@ -8,7 +8,13 @@ public interface StatsProjectService { /** * @Author sun - * @Description 数据-项目-机关、网格日(月)统计 + * @Description 数据-项目-机关日(月)统计 **/ - void agencyGridProjectStats(); + void agencyProjectStats(); + + /** + * @Author sun + * @Description 数据-项目-网格日(月)统计 + **/ + void gridProjectStats(); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 3525e45f97..1e5cac4aac 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -14,8 +14,9 @@ import com.epmet.service.project.ProjectProcessService; import com.epmet.service.project.ProjectService; import com.epmet.service.stats.*; import com.epmet.util.DimIdGenerator; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -34,6 +35,7 @@ import java.util.concurrent.atomic.AtomicInteger; @Service public class StatsProjectServiceImpl implements StatsProjectService { + protected static final Logger log = LoggerFactory.getLogger(StatsProjectServiceImpl.class); @Autowired private DimCustomerService dimCustomerService; @Autowired @@ -57,10 +59,10 @@ public class StatsProjectServiceImpl implements StatsProjectService { /** * @Author sun - * @Description 数据-项目-机关、网格日(月)统计 + * @Description 数据-项目-机关日(月)统计 **/ @Override - public void agencyGridProjectStats() { + public void agencyProjectStats() { int pageNo = 1; int pageSize = 100; List customerIdList = null; @@ -68,8 +70,13 @@ public class StatsProjectServiceImpl implements StatsProjectService { customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); if (!CollectionUtils.isEmpty(customerIdList)) { for (String customerId : customerIdList) { - //遍历统计每一个客户数据 - customerStats(customerId); + try { + //遍历统计每一个客户数据 + customerAgencyStats(customerId); + } catch (Exception e) { + log.error("项目-机关-数据统计程序错误，对应客户Id:"+customerId, e); + log.error("Error creating model JSON", e); + } } } } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); @@ -77,11 +84,10 @@ public class StatsProjectServiceImpl implements StatsProjectService { /** * @Author sun - * @Description 一个客户一个线程, 分别统计机关/网格日/月数据 + * @Description 分别统计机关日/月数据 **/ - @Async - public void customerStats(String customerId) { - Date date = new Date(); + public void customerAgencyStats(String customerId) { + Date date = yesterDay(); //1:查询各维度表Id,方便使用 DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); @@ -90,39 +96,25 @@ public class StatsProjectServiceImpl implements StatsProjectService { dimAgencyDTO.setCustomerId(customerId); List dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO); - //3:根据客户Id查询网格维度表数据 - List dimGridList = dimGridService.getGridListByCustomerId(customerId); - - //4:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据) + //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据) ProjectEntity projectEntity = new ProjectEntity(); projectEntity.setCustomerId(customerId); projectEntity.setCreatedTime(date); projectEntity.setStatus(ProjectConstant.CLOSED); List projectList = projectService.getProjectList(projectEntity); - //5:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据) + //4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据) List processList = projectProcessService.getProcessList(projectEntity); - //6:机关层级日月统计 + //5:机关层级日月统计 if (null != dimAgencyList && dimAgencyList.size() > NumConstant.ZERO) { - //6.1:执行机关日数据统计 + //5.1:执行机关日数据统计 agencyDateProjectStats(customerId, dimId, dimAgencyList, projectList, processList); - //6.2:执行机关月数据统计 - if (Calendar.getInstance().get(Calendar.DATE) == 1) { + //5.2:执行机关月数据统计 + //if (Calendar.getInstance().get(Calendar.DATE) == 1) { agencyMonthProjectStats(customerId, dimId, dimAgencyList); - } - } - - //7:网格层级日月统计 - if (null != dimGridList && dimGridList.size() > NumConstant.ZERO) { - //7.1:执行网格日数据统计 - gridDateProjectStats(customerId, dimId, dimGridList, projectList, processList); - - //7.2:执行网格月数据统计 - if (Calendar.getInstance().get(Calendar.DATE) == 1) { - gridMonthProjectStats(customerId, dimId, dimGridList); - } + //} } } @@ -138,7 +130,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { List projectDateEntityList = new ArrayList<>(); //计算百分比使用，保留小数点后两位 NumberFormat numberFormat = NumberFormat.getInstance(); - numberFormat.setMaximumFractionDigits(2); + numberFormat.setMaximumFractionDigits(6); //1:遍历机关维度数据,统计每个机关各项指标数 for (DimAgencyDTO agency : dimAgencyList) { @@ -232,12 +224,12 @@ public class StatsProjectServiceImpl implements StatsProjectService { agencyDailyEntity.setResolvedTotal(resolvedTotal.intValue()); agencyDailyEntity.setUnresolvedTotal(unResolvedTotal.intValue()); if (projectTotal.intValue() > NumConstant.ZERO) { - agencyDailyEntity.setPendingRatio(new BigDecimal(numberFormat.format((float) agencyDailyEntity.getPendingTotal() / (float) projectTotal.intValue() * 100))); - agencyDailyEntity.setClosedRatio(new BigDecimal(numberFormat.format((float) closedTotal.intValue() / (float) projectTotal.intValue() * 100))); + agencyDailyEntity.setPendingRatio(new BigDecimal(numberFormat.format((float) agencyDailyEntity.getPendingTotal() / (float) projectTotal.intValue()))); + agencyDailyEntity.setClosedRatio(new BigDecimal(numberFormat.format((float) closedTotal.intValue() / (float) projectTotal.intValue()))); } if (closedTotal.intValue() > NumConstant.ZERO) { - agencyDailyEntity.setResolvedRatio(new BigDecimal(numberFormat.format((float) resolvedTotal.intValue() / (float) closedTotal.intValue() * 100))); - agencyDailyEntity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) unResolvedTotal.intValue() / (float) closedTotal.intValue() * 100))); + agencyDailyEntity.setResolvedRatio(new BigDecimal(numberFormat.format((float) resolvedTotal.intValue() / (float) closedTotal.intValue()))); + agencyDailyEntity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) unResolvedTotal.intValue() / (float) closedTotal.intValue()))); } agencyDailyEntity.setProjectIncr(projectIncr.intValue()); agencyDailyEntity.setPendingIncr(projectIncr.intValue() - closedIncr.intValue()); @@ -276,8 +268,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { //1:获取昨天日期所在月份的起始日期和结束日期 MonthProjectListFormDTO formDTO = new MonthProjectListFormDTO(); formDTO.setCustomerId(customerId); - formDTO.setStartTime(getMonthBegin(date)); - formDTO.setEndTime(getMonthEnd(date)); + formDTO.setMonthId(dimId.getMonthId()); //2:遍历机关维度数据，分别统计每个组织月数据 for (DimAgencyDTO agency : dimAgencyList) { @@ -342,6 +333,65 @@ public class StatsProjectServiceImpl implements StatsProjectService { } + /** + * @Author sun + * @Description 数据-项目-机关日(月)统计 + **/ + @Override + public void gridProjectStats() { + int pageNo = 1; + int pageSize = 100; + List customerIdList = null; + do { + customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); + if (!CollectionUtils.isEmpty(customerIdList)) { + for (String customerId : customerIdList) { + try { + //遍历统计每一个客户数据 + customerGridStats(customerId); + } catch (Exception e) { + log.error("项目-网格-数据统计程序错误，对应客户Id:"+customerId, e); + log.error("Error creating model JSON", e); + } + } + } + } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); + } + + /** + * @Author sun + * @Description 分别统计网格日/月数据 + **/ + public void customerGridStats(String customerId) { + Date date = yesterDay(); + //1:查询各维度表Id,方便使用 + DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); + + //2:根据客户Id查询网格维度表数据 + List dimGridList = dimGridService.getGridListByCustomerId(customerId); + + //3:根据客户Id查询项目业务表已结案数据(查询传入日期及之前的数据) + ProjectEntity projectEntity = new ProjectEntity(); + projectEntity.setCustomerId(customerId); + projectEntity.setCreatedTime(date); + projectEntity.setStatus(ProjectConstant.CLOSED); + List projectList = projectService.getProjectList(projectEntity); + + //4:查询项目处理进展表中有效数据(创建日期截取yyyy-mm-dd格式字段值)(查询传入日期及之前的数据) + List processList = projectProcessService.getProcessList(projectEntity); + + //5:网格层级日月统计 + if (null != dimGridList && dimGridList.size() > NumConstant.ZERO) { + //5.1:执行网格日数据统计 + gridDateProjectStats(customerId, dimId, dimGridList, projectList, processList); + + //5.2:执行网格月数据统计 + //if (Calendar.getInstance().get(Calendar.DATE) == 1) { + gridMonthProjectStats(customerId, dimId, dimGridList); + //} + } + + } /** * @param customerId * @return @@ -354,7 +404,7 @@ public class StatsProjectServiceImpl implements StatsProjectService { List gridDateEntityList = new ArrayList<>(); //计算百分比使用，保留小数点后两位 NumberFormat numberFormat = NumberFormat.getInstance(); - numberFormat.setMaximumFractionDigits(2); + numberFormat.setMaximumFractionDigits(6); //1:根据客户Id查询议题库已转项目的网格项目关系数据 List gridProjectList = issueService.getGridProjectList(customerId); @@ -448,12 +498,12 @@ public class StatsProjectServiceImpl implements StatsProjectService { gridDailyEntity.setResolvedTotal(resolvedTotal.intValue()); gridDailyEntity.setUnresolvedTotal(unResolvedTotal.intValue()); if (projectTotal.intValue() > NumConstant.ZERO) { - gridDailyEntity.setPendingRatio(new BigDecimal(numberFormat.format((float) gridDailyEntity.getPendingTotal() / (float) projectTotal.intValue() * 100))); - gridDailyEntity.setClosedRatio(new BigDecimal(numberFormat.format((float) closedTotal.intValue() / (float) projectTotal.intValue() * 100))); + gridDailyEntity.setPendingRatio(new BigDecimal(numberFormat.format((float) gridDailyEntity.getPendingTotal() / (float) projectTotal.intValue()))); + gridDailyEntity.setClosedRatio(new BigDecimal(numberFormat.format((float) closedTotal.intValue() / (float) projectTotal.intValue()))); } if (closedTotal.intValue() > NumConstant.ZERO) { - gridDailyEntity.setResolvedRatio(new BigDecimal(numberFormat.format((float) resolvedTotal.intValue() / (float) closedTotal.intValue() * 100))); - gridDailyEntity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) unResolvedTotal.intValue() / (float) closedTotal.intValue() * 100))); + gridDailyEntity.setResolvedRatio(new BigDecimal(numberFormat.format((float) resolvedTotal.intValue() / (float) closedTotal.intValue()))); + gridDailyEntity.setUnresolvedRatio(new BigDecimal(numberFormat.format((float) unResolvedTotal.intValue() / (float) closedTotal.intValue()))); } gridDailyEntity.setProjectIncr(projectIncr.intValue()); gridDailyEntity.setPendingIncr(projectIncr.intValue() - closedIncr.intValue()); @@ -489,15 +539,14 @@ public class StatsProjectServiceImpl implements StatsProjectService { //批量月数据新增对象 List monthlyEntityList = new ArrayList<>(); - //1:获取昨天日期所在月份的起始日期和结束日期 + //1:查询客户网格月份内日统计数据 MonthProjectListFormDTO formDTO = new MonthProjectListFormDTO(); formDTO.setCustomerId(customerId); - formDTO.setStartTime(getMonthBegin(yesterDay())); - formDTO.setEndTime(getMonthEnd(yesterDay())); + formDTO.setMonthId(dimId.getMonthId()); //2:遍历网格维度数据，分别统计每个网格月数据 for (DimGridEntity grid : dimGridList) { - //2.1:查询上一月网格日统计数据，按时间倒序 + //2.1:查询当前月网格日统计数据，按时间倒序 formDTO.setGridId(grid.getId()); List projectDailyList = factGridProjectDailyService.getMonthProjectList(formDTO); @@ -575,46 +624,4 @@ public class StatsProjectServiceImpl implements StatsProjectService { return date; } - /** - * @Author sun - * @Description 获取指定日期所在月份开始的时间 - **/ - public Date getMonthBegin(Date date) { - Calendar c = Calendar.getInstance(); - c.setTime(date); - //设置为1号,当前日期既为本月第一天 - c.set(Calendar.DAY_OF_MONTH, 1); - //将小时至0 - c.set(Calendar.HOUR_OF_DAY, 0); - //将分钟至0 - c.set(Calendar.MINUTE, 0); - //将秒至0 - c.set(Calendar.SECOND, 0); - //将毫秒至0 - c.set(Calendar.MILLISECOND, 0); - //获取本月第一天的时间 - return c.getTime(); - } - - /** - * @Author sun - * @Description 获取指定日期所在月份结束的时间 - **/ - public Date getMonthEnd(Date date) { - Calendar c = Calendar.getInstance(); - c.setTime(date); - //设置为当月最后一天 - c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH)); - //将小时至23 - c.set(Calendar.HOUR_OF_DAY, 23); - //将分钟至59 - c.set(Calendar.MINUTE, 59); - //将秒至59 - c.set(Calendar.SECOND, 59); - //将毫秒至999 - c.set(Calendar.MILLISECOND, 999); - //获取本月最后一天的时间 - return c.getTime(); - } - } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyProjectDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyProjectDailyDao.xml index c9adcc2f29..eb6fc087bb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyProjectDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactAgencyProjectDailyDao.xml @@ -12,11 +12,7 @@ del_flag = '0' AND customer_id = #{customerId} AND agency_id = #{agencyId} - AND ( - DATE_FORMAT(created_time, "%Y-%m-%d") - BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") - AND DATE_FORMAT(#{endTime}, "%Y-%m-%d") - ) + AND month_id = #{monthId} ORDER BY created_time DESC,project_total DESC diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridProjectDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridProjectDailyDao.xml index 4dc999bba0..3f386bf7ba 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridProjectDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactGridProjectDailyDao.xml @@ -12,11 +12,7 @@ del_flag = '0' AND customer_id = #{customerId} AND grid_id = #{gridId} - AND ( - DATE_FORMAT(created_time, "%Y-%m-%d") - BETWEEN DATE_FORMAT(#{startTime}, "%Y-%m-%d") - AND DATE_FORMAT(#{endTime}, "%Y-%m-%d") - ) + AND month_id = #{monthId} ORDER BY created_time DESC,project_total DESC diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsProjectService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsProjectService.java new file mode 100644 index 0000000000..473f8c798b --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsProjectService.java @@ -0,0 +1,23 @@ +package com.epmet.service; + +import com.epmet.commons.tools.utils.Result; + +/** + * @Description 数据统计-项目-机关、网格日月统计任务接口 + * @Author sun + */ +public interface StatsProjectService { + + + /** + * @Description 数据统计-项目-机关日月统计 + * @Author sun + */ + Result agencyProjectStats(); + + /** + * @Description 数据统计-项目-网格日月统计 + * @Author sun + */ + Result gridProjectStats(); +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java new file mode 100644 index 0000000000..0245c79754 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -0,0 +1,34 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.StatsProjectService; +import feign.DataStatisticalOpenFeignClient; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * @Description 数据统计-项目-机关、网格日月统计任务接口 + * @Author sun + */ +public class StatsProjectServiceImpl implements StatsProjectService { + + @Autowired + private DataStatisticalOpenFeignClient statsPublicityFeignClient; + + /** + * @Description 数据统计-项目-机关日月统计 + * @Author sun + */ + @Override + public Result agencyProjectStats() { + return statsPublicityFeignClient.agencyProjectStats(); + } + + /** + * @Description 数据统计-项目-网格日月统计 + * @Author sun + */ + @Override + public Result gridProjectStats() { + return statsPublicityFeignClient.gridProjectStats(); + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java new file mode 100644 index 0000000000..fcb09dae46 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectAgencyTask.java @@ -0,0 +1,32 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.StatsProjectService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Description 数据统计-项目-机关日月统计任务 + * @Author sun + */ +@Component("statsProjectAgencyTask") +public class StatsProjectAgencyTask implements ITask { + + @Autowired + private StatsProjectService statsProjectService; + + private Logger log = LoggerFactory.getLogger(getClass()); + + @Override + public void run(String params) { + log.debug("StatsProjectAgencyTask定时任务正在执行，参数为：{}", params); + Result result = statsProjectService.agencyProjectStats(); + if (result.success()){ + log.debug("StatsProjectAgencyTask定时任务正在执行定时任务执行成功"); + }else { + log.debug("StatsProjectAgencyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java new file mode 100644 index 0000000000..293aa82380 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsProjectGridTask.java @@ -0,0 +1,35 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.StatsProjectService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @Author zxc + * @CreateTime 2020/6/22 14:09 + * + * 统计 “网格小组”， dim：【网格-日】 + * + */ +@Component("statsProjectGridTask") +public class StatsProjectGridTask implements ITask { + + @Autowired + private StatsProjectService statsProjectService; + + private Logger log = LoggerFactory.getLogger(getClass()); + + @Override + public void run(String params) { + log.debug("StatsProjectGridTask定时任务正在执行，参数为：{}", params); + Result result = statsProjectService.gridProjectStats(); + if (result.success()){ + log.debug("StatsProjectGridTask定时任务正在执行定时任务执行成功"); + }else { + log.debug("StatsProjectGridTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +} From ef6a5a034456be6a68064dedc53d11d6a587eb66 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 23 Jun 2020 15:09:28 +0800 Subject: [PATCH 16/34] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/issue/impl/IssueServiceImpl.java | 5 +- .../feign/DataStatisticalOpenFeignClient.java | 10 +++ ...ataStatisticalOpenFeignClientFallBack.java | 5 ++ .../dao/stats/FactIssueAgencyDailyDao.java | 10 +++ .../dao/stats/FactIssueAgencyMonthlyDao.java | 9 +++ .../dao/stats/FactIssueGridDailyDao.java | 10 +++ .../dao/stats/FactIssueGridMonthlyDao.java | 10 +++ .../service/impl/StatsIssueServiceImpl.java | 65 ++++++++++--------- .../stats/FactIssueAgencyDailyService.java | 19 ++++++ .../stats/FactIssueAgencyMonthlyService.java | 19 ++++++ .../stats/FactIssueGridDailyService.java | 19 ++++++ .../stats/FactIssueGridMonthlyService.java | 19 ++++++ .../impl/FactIssueAgencyDailyServiceImpl.java | 12 ++++ .../FactIssueAgencyMonthlyServiceImpl.java | 12 ++++ .../impl/FactIssueGridDailyServiceImpl.java | 12 ++++ .../impl/FactIssueGridMonthlyServiceImpl.java | 12 ++++ .../mapper/stats/FactIssueAgencyDailyDao.xml | 3 + .../stats/FactIssueAgencyMonthlyDao.xml | 3 + .../mapper/stats/FactIssueGridDailyDao.xml | 3 + .../mapper/stats/FactIssueGridMonthlyDao.xml | 8 +++ .../com/epmet/service/StatsIssueService.java | 19 ++++++ .../service/impl/StatsIssueServiceImpl.java | 23 +++++++ .../java/com/epmet/task/StatsIssueTask.java | 32 +++++++++ 23 files changed, 306 insertions(+), 33 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsIssueService.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java index 64fc2d99e0..51ba02884d 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.issue.impl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dao.issue.IssueDao; import com.epmet.dto.form.LoginUserDetailsFormDTO; @@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; @@ -167,6 +169,7 @@ public class IssueServiceImpl implements IssueService { } private String toRatio(BigDecimal data) { - return data.stripTrailingZeros().toString().concat("%"); + BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); + return data.multiply(hundred).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toString().concat("%"); } } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/DataStatisticalOpenFeignClient.java index 01c9953043..e6594bef5e 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/DataStatisticalOpenFeignClient.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/DataStatisticalOpenFeignClient.java @@ -104,4 +104,14 @@ public interface DataStatisticalOpenFeignClient { @PostMapping("/data/stats/statsgroup/groupagencymonthly") Result groupAgencyMonthly(); + /** + * 议题统计 + * @author zhaoqifeng + * @date 2020/6/23 14:34 + * @param + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("/data/stats/statsissue/issuestats") + Result agencyGridIssueStats(); + } diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/impl/DataStatisticalOpenFeignClientFallBack.java index 1ccec983eb..45d3768093 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/impl/DataStatisticalOpenFeignClientFallBack.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/feign/impl/DataStatisticalOpenFeignClientFallBack.java @@ -109,4 +109,9 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp public Result groupAgencyMonthly() { return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "groupAgencyMonthly"); } + + @Override + public Result agencyGridIssueStats() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "agencyGridIssueStats"); + } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueAgencyDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueAgencyDailyDao.java index be302f14a7..c6ee47eb10 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueAgencyDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueAgencyDailyDao.java @@ -20,6 +20,7 @@ package com.epmet.dao.stats; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.stats.FactIssueAgencyDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 议题数量(按日) @@ -29,5 +30,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface FactIssueAgencyDailyDao extends BaseDao { + /** + * 删除 + * @author zhaoqifeng + * @date 2020/6/23 14:02 + * @param customerId + * @param dateId + * @return void + */ + void deleteByCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueAgencyMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueAgencyMonthlyDao.java index acaf6e5d1b..6f9933bf1a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueAgencyMonthlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueAgencyMonthlyDao.java @@ -42,5 +42,14 @@ public interface FactIssueAgencyMonthlyDao extends BaseDao */ List selectAgencyMonthlyInc(@Param("customerId") String customerId, @Param("monthId") String monthId); + /** + * 删除 + * @author zhaoqifeng + * @date 2020/6/23 14:02 + * @param customerId + * @param monthId + * @return void + */ + void deleteByCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueGridDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueGridDailyDao.java index 7249383370..595131257d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueGridDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueGridDailyDao.java @@ -20,6 +20,7 @@ package com.epmet.dao.stats; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.stats.FactIssueGridDailyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 网格议题数量(按日) @@ -29,5 +30,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface FactIssueGridDailyDao extends BaseDao { + /** + * 删除 + * @author zhaoqifeng + * @date 2020/6/23 14:02 + * @param customerId + * @param dateId + * @return void + */ + void deleteByCustomerId(@Param("customerId") String customerId, @Param("dateId") String dateId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueGridMonthlyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueGridMonthlyDao.java index 2e9c335661..502363d1b0 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueGridMonthlyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactIssueGridMonthlyDao.java @@ -42,4 +42,14 @@ public interface FactIssueGridMonthlyDao extends BaseDao */ List selectGridMonthlyInc(@Param("customerId") String customerId, @Param("monthId") String monthId); + + /** + * 删除 + * @author zhaoqifeng + * @date 2020/6/23 14:02 + * @param customerId + * @param monthId + * @return void + */ + void deleteByCustomerId(@Param("customerId") String customerId, @Param("monthId") String monthId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java index 6da113060e..fd6ffe7b88 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java @@ -96,6 +96,10 @@ public class StatsIssueServiceImpl implements StatsIssueService { String dateString = DateUtils.format(date); DimAgencyDTO dimAgencyDTO = new DimAgencyDTO(); dimAgencyDTO.setCustomerId(customerId); + //获取日期相关维度 + DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); + //清空数据 + factIssueAgencyDailyService.deleteByCustomerId(customerId, dimId.getDateId()); //获取当前客户下所有机关 List agencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO); //获取机关下议题各种状态的数目统计 @@ -110,8 +114,6 @@ public class StatsIssueServiceImpl implements StatsIssueService { List projectAgencyClosedTotalList = projectService.getAgencyClosedProjectTotal(customerId, dateString); //已结案项目增量 List projectAgencyClosedIncList = projectService.getAgencyClosedProjectInc(customerId, dateString); - //获取日期相关维度 - DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); List list = new ArrayList<>(); for (DimAgencyDTO agency : agencyList) { @@ -149,7 +151,7 @@ public class StatsIssueServiceImpl implements StatsIssueService { list.add(entity); } //批量插入 - factIssueAgencyDailyService.insertBatch(list); + factIssueAgencyDailyService.saveList(list); } @Override @@ -157,6 +159,10 @@ public class StatsIssueServiceImpl implements StatsIssueService { String dateString = DateUtils.format(date); DimAgencyDTO dimAgencyDTO = new DimAgencyDTO(); dimAgencyDTO.setCustomerId(customerId); + //获取日期相关维度 + DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); + //清空数据 + factIssueAgencyMonthlyService.deleteByCustomerId(customerId, dimId.getMonthId()); //获取当前客户下所有机关 List agencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO); //获取机关下议题各种状态的数目统计 @@ -165,11 +171,8 @@ public class StatsIssueServiceImpl implements StatsIssueService { List issueAgencyClosedTotalList = issueService.getAgencyClosedIssueTotal(customerId, dateString); //已结案项目统计 List projectAgencyClosedTotalList = projectService.getAgencyClosedProjectTotal(customerId, dateString); - //获取日期相关维度 - DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); //统计机关下议题各个指标月度增量 List issueAgencyMonthlyIncList = factIssueAgencyMonthlyService.getAgencyMonthlyInc(customerId, dimId.getMonthId()); - List list = new ArrayList<>(); for (DimAgencyDTO agency : agencyList) { FactIssueAgencyDailyEntity daily = initIssueAgencyDaily(dimId); @@ -215,7 +218,7 @@ public class StatsIssueServiceImpl implements StatsIssueService { list.add(monthly); } //批量插入 - factIssueAgencyMonthlyService.insertBatch(list); + factIssueAgencyMonthlyService.saveList(list); } @Override @@ -225,6 +228,8 @@ public class StatsIssueServiceImpl implements StatsIssueService { dimAgencyDTO.setCustomerId(customerId); //获取日期相关维度 DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); + //清空数据 + factIssueGridDailyService.deleteByCustomerId(customerId, dimId.getDateId()); //获取客户下所有网格数据 List gridList = dimGridService.getGridListByCustomerId(customerId); //获取网格下议题各种状态的数目统计 @@ -241,6 +246,7 @@ public class StatsIssueServiceImpl implements StatsIssueService { List closedProjectTotalList = projectService.getGridClosedProjectTotal(customerId, dateString); //已结案项目增量 List closedProjectIncList = projectService.getGridClosedProjectTotal(customerId, dateString); + Map resolveMap= new HashMap<>(); Map unResolveMap = new HashMap<>(); Map resolveIncMap = new HashMap<>(); @@ -313,7 +319,7 @@ public class StatsIssueServiceImpl implements StatsIssueService { saveClosedProject(resolveMap, unResolveMap, resolveIncMap, unResolveIncMap, grid, entity); list.add(entity); } - factIssueGridDailyService.insertBatch(list); + factIssueGridDailyService.saveList(list); } @Override @@ -323,6 +329,8 @@ public class StatsIssueServiceImpl implements StatsIssueService { dimAgencyDTO.setCustomerId(customerId); //获取日期相关维度 DimIdGenerator.DimIdBean dimId = DimIdGenerator.getDimIdBean(date); + //清空数据 + factIssueGridMonthlyService.deleteByCustomerId(customerId, dimId.getMonthId()); //获取客户下所有网格数据 List gridList = dimGridService.getGridListByCustomerId(customerId); //获取网格下议题各种状态的数目统计 @@ -383,12 +391,11 @@ public class StatsIssueServiceImpl implements StatsIssueService { monthly.setClosedCaseResolvedTotal(resolve); monthly.setClosedCaseUnresolvedTotal(unResolve); if(total > NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); BigDecimal resolved = new BigDecimal(resolve); BigDecimal unresolved = new BigDecimal(unResolve); BigDecimal closed = new BigDecimal(total); - monthly.setClosedCaseResolvedPercent(resolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); - monthly.setClosedCaseUnresolvedPercent(unresolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); + monthly.setClosedCaseResolvedPercent(resolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); + monthly.setClosedCaseUnresolvedPercent(unresolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); } //各指标增量统计 @@ -413,7 +420,7 @@ public class StatsIssueServiceImpl implements StatsIssueService { monthly.setGridId(grid.getId()); list.add(monthly); } - factIssueGridMonthlyService.insertBatch(list); + factIssueGridMonthlyService.saveList(list); } /** @@ -443,12 +450,11 @@ public class StatsIssueServiceImpl implements StatsIssueService { entity.setClosedCaseResolvedIncr(resolveInc); entity.setClosedCaseUnresolvedIncr(unResolveInc); if(total != NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); BigDecimal resolved = new BigDecimal(resolve); BigDecimal unresolved = new BigDecimal(unResolve); BigDecimal closed = new BigDecimal(total); - entity.setClosedCaseResolvedPercent(resolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); - entity.setClosedCaseUnresolvedPercent(unresolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); + entity.setClosedCaseResolvedPercent(resolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); + entity.setClosedCaseUnresolvedPercent(unresolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); } } @@ -513,12 +519,11 @@ public class StatsIssueServiceImpl implements StatsIssueService { entity.setClosedResolvedTotal(resolvedCount); entity.setClosedUnresolvedTotal(unresolvedCount); if(entity.getClosedTotal() > NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); BigDecimal resolved = new BigDecimal(resolvedCount); BigDecimal unresolved = new BigDecimal(unresolvedCount); BigDecimal closed = new BigDecimal(entity.getClosedTotal()); - entity.setClosedResolvedPercent(resolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); - entity.setClosedUnresolvedPercent(unresolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); + entity.setClosedResolvedPercent(resolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); + entity.setClosedUnresolvedPercent(unresolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); } } @@ -597,14 +602,13 @@ public class StatsIssueServiceImpl implements StatsIssueService { entity.setClosedTotal(closedCount); entity.setIssueTotal(issueTotal); if (NumConstant.ZERO != issueTotal) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); BigDecimal voting = new BigDecimal(votingCount); BigDecimal shift = new BigDecimal(shiftCount); BigDecimal closed = new BigDecimal(closedCount); BigDecimal total = new BigDecimal(issueTotal); - entity.setVotingPercent(voting.multiply(hundred).divide(total, NumConstant.TWO, RoundingMode.HALF_UP)); - entity.setShiftProjectPercent(shift.multiply(hundred).divide(total, NumConstant.TWO, RoundingMode.HALF_UP)); - entity.setClosedPercent(closed.multiply(hundred).divide(total, NumConstant.TWO, RoundingMode.HALF_UP)); + entity.setVotingPercent(voting.divide(total, NumConstant.SIX, RoundingMode.HALF_UP)); + entity.setShiftProjectPercent(shift.divide(total, NumConstant.SIX, RoundingMode.HALF_UP)); + entity.setClosedPercent(closed.divide(total, NumConstant.SIX, RoundingMode.HALF_UP)); } } @@ -676,12 +680,11 @@ public class StatsIssueServiceImpl implements StatsIssueService { entity.setClosedCaseUnresolvedTotal(unresolvedCount); entity.setClosedCaseTotal(total); if (total > NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); BigDecimal resolved = new BigDecimal(resolvedCount); BigDecimal unresolved = new BigDecimal(unresolvedCount); BigDecimal closed = new BigDecimal(total); - entity.setClosedCaseResolvedPercent(resolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); - entity.setClosedCaseUnresolvedPercent(unresolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); + entity.setClosedCaseResolvedPercent(resolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); + entity.setClosedCaseUnresolvedPercent(unresolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); } } @@ -763,14 +766,13 @@ public class StatsIssueServiceImpl implements StatsIssueService { entity.setClosedTotal(closedCount); entity.setIssueTotal(issueTotal); if (NumConstant.ZERO != issueTotal) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); BigDecimal voting = new BigDecimal(votingCount); BigDecimal shift = new BigDecimal(shiftCount); BigDecimal closed = new BigDecimal(closedCount); BigDecimal total = new BigDecimal(issueTotal); - entity.setVotingPercent(voting.multiply(hundred).divide(total, NumConstant.TWO, RoundingMode.HALF_UP)); - entity.setShiftProjectPercent(shift.multiply(hundred).divide(total, NumConstant.TWO, RoundingMode.HALF_UP)); - entity.setClosedPercent(closed.multiply(hundred).divide(total, NumConstant.TWO, RoundingMode.HALF_UP)); + entity.setVotingPercent(voting.divide(total, NumConstant.SIX, RoundingMode.HALF_UP)); + entity.setShiftProjectPercent(shift.divide(total, NumConstant.SIX, RoundingMode.HALF_UP)); + entity.setClosedPercent(closed.divide(total, NumConstant.SIX, RoundingMode.HALF_UP)); } } @@ -806,12 +808,11 @@ public class StatsIssueServiceImpl implements StatsIssueService { entity.setClosedResolvedTotal(resolvedCount); entity.setClosedUnresolvedTotal(unresolvedCount); if (entity.getClosedTotal() > NumConstant.ZERO) { - BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); BigDecimal resolved = new BigDecimal(resolvedCount); BigDecimal unresolved = new BigDecimal(unresolvedCount); BigDecimal closed = new BigDecimal(entity.getClosedTotal()); - entity.setClosedResolvedPercent(resolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); - entity.setClosedUnresolvedPercent(unresolved.multiply(hundred).divide(closed, NumConstant.TWO, RoundingMode.HALF_UP)); + entity.setClosedResolvedPercent(resolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); + entity.setClosedUnresolvedPercent(unresolved.divide(closed, NumConstant.SIX, RoundingMode.HALF_UP)); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueAgencyDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueAgencyDailyService.java index 40f9c9e472..9334a5637c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueAgencyDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueAgencyDailyService.java @@ -92,4 +92,23 @@ public interface FactIssueAgencyDailyService extends BaseService list); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueAgencyMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueAgencyMonthlyService.java index ebd176bb4e..b388e8ee58 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueAgencyMonthlyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueAgencyMonthlyService.java @@ -102,4 +102,23 @@ public interface FactIssueAgencyMonthlyService extends BaseService */ List getAgencyMonthlyInc(String customerId, String monthId); + + /** + * 根据客户ID删除 + * @author zhaoqifeng + * @date 2020/6/23 14:07 + * @param customerId + * @param monthId + * @return void + */ + void deleteByCustomerId(String customerId, String monthId); + + /** + * 批量保存 + * @author zhaoqifeng + * @date 2020/6/23 14:07 + * @param list + * @return void + */ + void saveList(List list); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueGridDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueGridDailyService.java index 58beae9049..786f71ac90 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueGridDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueGridDailyService.java @@ -92,4 +92,23 @@ public interface FactIssueGridDailyService extends BaseService list); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueGridMonthlyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueGridMonthlyService.java index 302c320653..a40b8c7236 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueGridMonthlyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactIssueGridMonthlyService.java @@ -102,4 +102,23 @@ public interface FactIssueGridMonthlyService extends BaseService */ List getGridMonthlyInc(String customerId, String monthId); + + /** + * 根据客户ID删除 + * @author zhaoqifeng + * @date 2020/6/23 14:07 + * @param customerId + * @param monthId + * @return void + */ + void deleteByCustomerId(String customerId, String monthId); + + /** + * 批量保存 + * @author zhaoqifeng + * @date 2020/6/23 14:07 + * @param list + * @return void + */ + void saveList(List list); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyDailyServiceImpl.java index b43614cc43..e6007e90d2 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyDailyServiceImpl.java @@ -97,4 +97,16 @@ public class FactIssueAgencyDailyServiceImpl extends BaseServiceImpl list) { + insertBatch(list); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyMonthlyServiceImpl.java index 47db53b737..7215ecb179 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueAgencyMonthlyServiceImpl.java @@ -103,4 +103,16 @@ public class FactIssueAgencyMonthlyServiceImpl extends BaseServiceImpl list) { + insertBatch(list); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridDailyServiceImpl.java index feebc25a82..063e2ef8c5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridDailyServiceImpl.java @@ -97,4 +97,16 @@ public class FactIssueGridDailyServiceImpl extends BaseServiceImpl list) { + insertBatch(list); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridMonthlyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridMonthlyServiceImpl.java index 1c084b836a..d3b0468011 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridMonthlyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactIssueGridMonthlyServiceImpl.java @@ -102,4 +102,16 @@ public class FactIssueGridMonthlyServiceImpl extends BaseServiceImpl list) { + insertBatch(list); + } + } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyDailyDao.xml index 59d538fe2f..20262ed8d4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyDailyDao.xml @@ -45,6 +45,9 @@ + + DELETE FROM fact_issue_agency_daily WHERE CUSTOMER_ID = #{customerId} AND DATE_ID = #{dateId} + \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyMonthlyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyMonthlyDao.xml index f6bdd808cb..430abbd36c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyMonthlyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/FactIssueAgencyMonthlyDao.xml @@ -43,6 +43,9 @@ + + DELETE FROM fact_issue_agency_monthly WHERE CUSTOMER_ID = #{customerId} AND MONTH_ID = #{monthId} + SELECT diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsIssueService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsIssueService.java new file mode 100644 index 0000000000..23590743e6 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/StatsIssueService.java @@ -0,0 +1,19 @@ +package com.epmet.service; + +import com.epmet.commons.tools.utils.Result; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/6/23 14:38 + */ +public interface StatsIssueService { + /** + * 议题统计 + * @author zhaoqifeng + * @date 2020/6/23 14:39 + * @param + * @return com.epmet.commons.tools.utils.Result + */ + Result agencyGridIssueStats(); +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java new file mode 100644 index 0000000000..a8803c5f5e --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java @@ -0,0 +1,23 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.StatsIssueService; +import feign.DataStatisticalOpenFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/6/23 14:40 + */ +@Service +public class StatsIssueServiceImpl implements StatsIssueService { + @Autowired + private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; + + @Override + public Result agencyGridIssueStats() { + return dataStatisticalOpenFeignClient.agencyGridIssueStats(); + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java new file mode 100644 index 0000000000..20448d11d2 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StatsIssueTask.java @@ -0,0 +1,32 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.StatsIssueService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.logging.Log; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/6/23 14:36 + */ +@Slf4j +@Component("statsIssueTask") +public class StatsIssueTask implements ITask { + @Autowired + private StatsIssueService statsIssueService; + + @Override + public void run(String params) { + log.debug("StatsGroupGridDailyTask定时任务正在执行，参数为：{}", params); + Result result = statsIssueService.agencyGridIssueStats(); + if (result.success()){ + log.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行成功"); + }else { + log.debug("StatsGroupGridDailyTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +} From d0ede0b82d727637594b4db0da6591f28910faec Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 23 Jun 2020 15:34:38 +0800 Subject: [PATCH 17/34] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/issue/impl/IssueServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java index 51ba02884d..4271cbe29e 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/issue/impl/IssueServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import java.math.BigDecimal; import java.math.RoundingMode; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.List; @@ -170,6 +171,6 @@ public class IssueServiceImpl implements IssueService { private String toRatio(BigDecimal data) { BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED); - return data.multiply(hundred).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toString().concat("%"); + return data.multiply(hundred).setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString().concat("%"); } } From 8439beb0f779dbc5c3f88f088d6969209f1a31d3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 16:58:47 +0800 Subject: [PATCH 18/34] =?UTF-8?q?=E6=94=AF=E9=83=A8=E7=AE=A1=E7=90=86bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E5=85=9A=E5=91=98=E5=BA=93=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=8F=AA=E5=85=81=E8=AE=B8=E4=B8=80=E4=B8=AA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=A4=E8=AF=81=E6=BF=80=E6=B4=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/IdCardNoValidatorUtils.java | 2 +- .../dao/PartymemberAuthRecordDao.java | 4 +- .../impl/PartymemberBaseInfoServiceImpl.java | 10 ++--- .../partymember/PartymemberAuthRecordDao.xml | 1 + .../partymember/PartymemberBaseInfoDao.xml | 43 ++++++++++++++----- 5 files changed, 42 insertions(+), 18 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java index 2aa3e2c964..08a96295ac 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/validator/IdCardNoValidatorUtils.java @@ -46,7 +46,7 @@ public class IdCardNoValidatorUtils { return false; } } else { - logger.info(String.format("身份证号%s最后一位为数字")); + logger.info(String.format("身份证号%s最后一位为数字",idCardNo)); } } if (idCardNo.length() == 18) { diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java index b49ca7552f..5957ee1fb0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberAuthRecordDao.java @@ -21,6 +21,8 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partymember.entity.PartymemberAuthRecordEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 党员认证记录表 * @@ -37,5 +39,5 @@ public interface PartymemberAuthRecordDao extends BaseDao selectByPartyMemberBaseInfoId(String partymemberBaseInfoId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java index ae51f2cc19..35e890d7b7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java @@ -441,10 +441,10 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl entityList = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(partyMemberId); + if (null != entityList&&entityList.size()>0) { partyMemberBaseInfoDetailResultDTO.setStatus(Boolean.TRUE); - partyMemberBaseInfoDetailResultDTO.setActiveDesc(entity.getAuthDesc()); + partyMemberBaseInfoDetailResultDTO.setActiveDesc(entityList.get(0).getAuthDesc()); } else { partyMemberBaseInfoDetailResultDTO.setStatus(Boolean.FALSE); partyMemberBaseInfoDetailResultDTO.setActiveDesc(""); @@ -456,8 +456,8 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl entityList = partymemberAuthRecordDao.selectByPartyMemberBaseInfoId(formDTO.getPartyMemberId()); + if (null != entityList&&entityList.size()>0) { throw new RenException(EpmetErrorCode.CANNOT_DELETE_PARTY_MEMBER.getCode()); } this.deleteById(formDTO.getPartyMemberId()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml index f61badbc80..7bb2065080 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberAuthRecordDao.xml @@ -25,5 +25,6 @@ select * from partymember_auth_record where DEL_FLAG='0' and PARTYMEMBER_BASE_INFO_ID=#{partymemberBaseInfoId} + order by CREATED_TIME desc \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml index b7aa868f90..1b2ea4f5ee 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml @@ -25,33 +25,54 @@ SELECT * FROM - partymember_base_info + partymember_base_info pbi WHERE - CUSTOMER_ID = #{customerId} - AND ID_CARD = #{idCard} - AND DEL_FLAG = 0 + pbi.CUSTOMER_ID = #{customerId} + AND pbi.ID_CARD = #{idCard} + AND pbi.DEL_FLAG = 0 + AND NOT EXISTS (SELECT + * + FROM + partymember_auth_record m + WHERE + pbi.id=m.PARTYMEMBER_BASE_INFO_ID + and m.del_flag='0') From a3b602b93a634ebb22b711c573a86816079fe788 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 23 Jun 2020 18:39:19 +0800 Subject: [PATCH 19/34] =?UTF-8?q?job=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index 6fa78a1a12..e6b1bc05c5 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.7 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.8 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index f589819cb1..3a9a14c5c8 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.7 + 0.3.8 com.epmet epmet-job From cdb45bc42a8a92a9c077856773d708148528989c Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Jun 2020 18:41:42 +0800 Subject: [PATCH 20/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voice/ArticleGridPublishedSummaryDTO.java | 5 + .../java/com/epmet/dao/voice/ArticleDao.java | 6 +- .../dao/voice/ArticleOperateRecordDao.java | 33 +++ ...FactArticlePublishedAgencyDailyEntity.java | 5 + ...ArticlePublishedDepartmentDailyEntity.java | 5 + .../FactArticlePublishedGridDailyEntity.java | 5 + .../voice/ArticleOperateRecordEntity.java | 76 ++++++ .../service/impl/StatsDimServiceImpl.java | 6 +- .../impl/StatsPublicityServiceImpl.java | 220 ++++++++++-------- ...rticlePublishedAgencyDailyServiceImpl.java | 2 + .../voice/ArticleOperateRecordService.java | 31 +++ .../epmet/service/voice/ArticleService.java | 13 +- .../impl/ArticleOperateRecordServiceImpl.java | 40 ++++ .../voice/impl/ArticleServiceImpl.java | 23 +- .../db/migration/data_statistical.sql | 188 +++++++-------- .../resources/mapper/voice/ArticleDao.xml | 18 +- .../mapper/voice/ArticleOperateRecordDao.xml | 6 + 17 files changed, 468 insertions(+), 214 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleOperateRecordDao.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/voice/ArticleOperateRecordEntity.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleOperateRecordService.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleOperateRecordServiceImpl.java create mode 100644 epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleOperateRecordDao.xml diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/voice/ArticleGridPublishedSummaryDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/voice/ArticleGridPublishedSummaryDTO.java index ec57f7d823..9596c7a2a2 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/voice/ArticleGridPublishedSummaryDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/voice/ArticleGridPublishedSummaryDTO.java @@ -44,6 +44,11 @@ public class ArticleGridPublishedSummaryDTO implements Serializable { * 发布文章总数 */ private Integer articleTotalCount; + + /** + * 今日发布文章数 + */ + private Integer publishedCount; /** * 状态为发布中的文章总数 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java index df01214d40..8ad5156de5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleDao.java @@ -23,7 +23,6 @@ import com.epmet.entity.voice.ArticleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; /** @@ -43,15 +42,14 @@ public interface ArticleDao extends BaseDao { * @param publisherType * @return */ - List getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") Date publishDate, @Param("publisherType") String publisherType); + List getAllPublishedCount(@Param("customerId") String customerId, @Param("publishDate") String publishDate, @Param("publisherType") String publisherType); /** * desc:根据客户Id 和发布时间 获取文章数据 * * @param customerId * @param publishDate - * @param publisherType * @return */ - List getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") Date publishDate, @Param("publisherType") String publisherType); + List getPublishedArticleByDay(@Param("customerId") String customerId, @Param("publishDate") String publishDate); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleOperateRecordDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleOperateRecordDao.java new file mode 100644 index 0000000000..30c8117e51 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticleOperateRecordDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dao.voice; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.voice.ArticleOperateRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 文章操作记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-06-17 + */ +@Mapper +public interface ArticleOperateRecordDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedAgencyDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedAgencyDailyEntity.java index 631f21fa49..1bd71f4989 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedAgencyDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedAgencyDailyEntity.java @@ -55,6 +55,11 @@ public class FactArticlePublishedAgencyDailyEntity extends BaseEpmetEntity { */ private Integer articleTotalCount; + /** + * 今日发布文章数 + */ + private Integer publishedCount; + /** * 当前发文数量 当前未下线的文章数量 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedDepartmentDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedDepartmentDailyEntity.java index 96e8ae407f..114dd2d8d8 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedDepartmentDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedDepartmentDailyEntity.java @@ -55,6 +55,11 @@ public class FactArticlePublishedDepartmentDailyEntity extends BaseEpmetEntity { */ private Integer articleTotalCount; + /** + * 今日发布文章数 + */ + private Integer publishedCount; + /** * 当前发文数量 当前未下线的文章数量 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedGridDailyEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedGridDailyEntity.java index 94d209d414..d1cd23de07 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedGridDailyEntity.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedGridDailyEntity.java @@ -55,6 +55,11 @@ public class FactArticlePublishedGridDailyEntity extends BaseEpmetEntity { */ private Integer articleTotalCount; + /** + * 今日发布文章数 + */ + private Integer publishedCount; + /** * 当前发文数量 当前未下线的文章数量 */ diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/voice/ArticleOperateRecordEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/voice/ArticleOperateRecordEntity.java new file mode 100644 index 0000000000..3efa67d17f --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/voice/ArticleOperateRecordEntity.java @@ -0,0 +1,76 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.entity.voice; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 文章操作记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-06-17 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("article_operate_record") +public class ArticleOperateRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 文章ID + */ + private String articleId; + + /** + * 网格ID，下线文章时，多个以英文:隔开 + */ + private String gridIds; + + /** + * 执行人 xx街道-xx中心-姓名 + */ + private String opUser; + + /** + * 操作内容 操作内容，eg：重新编辑文章； + */ + private String content; + + /** + * 操作类型 发布文章：publish；取消文章置顶：canceltop；设置置顶：settop；下线文章：offline；修改文章发布范围：updatepublishrange + */ + private String opType; + + /** + * 操作时间 + */ + private Date opTime; + +} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java index ff97cf767b..90404da3be 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsDimServiceImpl.java @@ -104,7 +104,7 @@ public class StatsDimServiceImpl implements StatsDimService { lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_AGENCY); } - Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD); + Date statsEndTime = new Date(); Date statsStartTime = null; if (lastExecRecord.getExecTime() != null) { statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD); @@ -126,7 +126,7 @@ public class StatsDimServiceImpl implements StatsDimService { lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_CUSTOMER); } - Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD); + Date statsEndTime = new Date(); Date statsStartTime = null; if (lastExecRecord.getExecTime() != null) { statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD); @@ -145,7 +145,7 @@ public class StatsDimServiceImpl implements StatsDimService { lastExecRecord = lastExecRecordService.createLastExecRecord(StatsSubject.DIM_DEPARTMENT); } - Date statsEndTime = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN_YYYYMMDD); + Date statsEndTime = new Date(); Date statsStartTime = null; if (lastExecRecord.getExecTime() != null) { statsStartTime = DateUtils.integrate(lastExecRecord.getExecTime(), DateUtils.DATE_PATTERN_YYYYMMDD); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java index 19d89bbe11..e21c1e1488 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java @@ -14,6 +14,7 @@ import com.epmet.entity.voice.ArticleEntity; import com.epmet.entity.voice.ArticleTagsEntity; import com.epmet.service.StatsPublicityService; import com.epmet.service.stats.*; +import com.epmet.service.voice.ArticleOperateRecordService; import com.epmet.service.voice.ArticleService; import com.epmet.service.voice.ArticleTagsService; import com.epmet.service.voice.ArticleVisitRecordService; @@ -55,6 +56,8 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { @Autowired private ArticleVisitRecordService articleVisitRecordService; @Autowired + private ArticleOperateRecordService articleOperateRecordService; + @Autowired private FactArticlePublishedGridDailyService factArticlePublishedGridDailyService; @Autowired private FactArticlePublishedDepartmentDailyService factArticlePublishedDepartmentDailyService; @@ -107,27 +110,26 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { public Boolean articleSummaryDailyStatsjob(Date statsDate) { //如果不传时间 则统计数据为今天之前的数据和，否则统计的是截止到传入的日期数据的和 if (statsDate == null) { - //当天的凌晨时间 即为今天之前的数据 - statsDate = DateUtils.integrate(new Date(), DateUtils.DATE_PATTERN); + //查询的是昨天及以前的数据 + statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, -1), DateUtils.DATE_PATTERN); } else { - statsDate = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN); + statsDate = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN); } DimIdGenerator.DimIdBean dimIdBean = DimIdGenerator.getDimIdBean(statsDate); int pageNo = 1; int pageSize = 100; List customerIdList = null; + String statsDateStr = DateUtils.format(statsDate); do { customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize); if (!CollectionUtils.isEmpty(customerIdList)) { for (String customerId : customerIdList) { - Date finalStatsDate = statsDate; - try { //key:所在机关Id Map agencySummaryMap = new HashMap<>(); - statsPublishedGridDaily(finalStatsDate, dimIdBean, customerId, agencySummaryMap); - statsPublishedDepartmentDaily(finalStatsDate, dimIdBean, customerId, agencySummaryMap); - statsPublishedAgencyDaily(finalStatsDate, dimIdBean, customerId, agencySummaryMap); + statsPublishedGridDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap); + statsPublishedDepartmentDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap); + statsPublishedAgencyDaily(statsDateStr, dimIdBean, customerId, agencySummaryMap); } catch (Exception e) { log.error("articlePublishedCountDayStats exception", e); } @@ -157,10 +159,10 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { if (!CollectionUtils.isEmpty(customerIdList)) { for (String customerId : customerIdList) { Date finalStatsDate = statsDate; - executorService.submit(() -> { + //executorService.submit(() -> { //统计 statsTagUsedDaily(finalStatsDate, dimIdBean, customerId); - }); + //}); } } } while (!CollectionUtils.isEmpty(customerIdList) && customerIdList.size() == pageSize); @@ -334,7 +336,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { return true; } - private void statsPublishedDepartmentDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map agencySummaryMap) { + private void statsPublishedDepartmentDaily(String statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map agencySummaryMap) { //获取所有客户 List departmentDTOList = dimDepartmentService.getDepartmentListByCustomerId(customerId); if (CollectionUtils.isEmpty(departmentDTOList)) { @@ -345,7 +347,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { //转换为 需要插入的Entity Map departmentDailyEntityMap = convertDepartmentDailyEntity(departmentDTOList, dimIdBean); //获取当天的业务数据 - List publishedArticleCount = articleService.getAllDepartmentPublishedCount(customerId, DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN)); + List publishedArticleCount = articleService.getAllDepartmentPublishedCount(customerId, statsDate); if (!CollectionUtils.isEmpty(publishedArticleCount)) { for (ArticleGridPublishedSummaryDTO summaryDTO : publishedArticleCount) { @@ -356,6 +358,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { } gridDailyEntities.setArticleTotalCount(summaryDTO.getArticleTotalCount()); gridDailyEntities.setArticlePublishedCount(summaryDTO.getArticlePublishedCount()); + gridDailyEntities.setPublishedCount(summaryDTO.getPublishedCount()); //同一个机关下数据累加 buildAgencySummaryData(agencySummaryMap, summaryDTO); } @@ -381,10 +384,12 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { summary.setPublisherId(summaryDTO.getPublisherId()); summary.setArticleTotalCount(summaryDTO.getArticleTotalCount()); summary.setArticlePublishedCount(summaryDTO.getArticlePublishedCount()); + summary.setPublishedCount(summaryDTO.getPublishedCount()); result.put(summaryDTO.getPublisherId(), summaryDTO); } else { publishedSummaryDTO.setArticlePublishedCount(publishedSummaryDTO.getArticlePublishedCount() + summaryDTO.getArticlePublishedCount()); publishedSummaryDTO.setArticleTotalCount(publishedSummaryDTO.getArticleTotalCount() + summaryDTO.getArticlePublishedCount()); + publishedSummaryDTO.setPublishedCount(publishedSummaryDTO.getPublishedCount() + summaryDTO.getPublishedCount()); } } @@ -396,7 +401,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { * @param customerId * @param agencySummaryMap */ - private void statsPublishedGridDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map agencySummaryMap) { + private void statsPublishedGridDaily(String statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map agencySummaryMap) { //获取所有网格 List gridDTOList = dimGridService.getGridListByCustomerId(customerId); if (CollectionUtils.isEmpty(gridDTOList)) { @@ -404,29 +409,34 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { return; } executorService.submit(() -> { - //转换为 需要插入的Entity - Map gridDailyEntityMap = convertGridDailyEntity(gridDTOList, dimIdBean); - //获取当天的业务数据 - List publishedArticleCount = articleService.getAllGridPublishedCount(customerId, statsDate); - if (!CollectionUtils.isEmpty(publishedArticleCount)) { - for (ArticleGridPublishedSummaryDTO summaryDTO : publishedArticleCount) { - FactArticlePublishedGridDailyEntity gridDailyEntity = gridDailyEntityMap.get(summaryDTO.getGridId()); - if (gridDailyEntity == null) { - log.error("publicitySummary getAllGridPublishedCount gridId:{} not exist in dimGrid", summaryDTO.getGridId()); - continue; + try { + //转换为 需要插入的Entity + Map gridDailyEntityMap = convertGridDailyEntity(gridDTOList, dimIdBean); + //获取当天的业务数据 + List publishedArticleCount = articleService.getAllGridPublishedCount(customerId, statsDate); + if (!CollectionUtils.isEmpty(publishedArticleCount)) { + for (ArticleGridPublishedSummaryDTO summaryDTO : publishedArticleCount) { + FactArticlePublishedGridDailyEntity gridDailyEntity = gridDailyEntityMap.get(summaryDTO.getPublisherId()); + if (gridDailyEntity == null) { + log.error("publicitySummary getAllGridPublishedCount gridId:{} not exist in dimGrid", summaryDTO.getGridId()); + continue; + } + gridDailyEntity.setArticleTotalCount(summaryDTO.getArticleTotalCount()); + gridDailyEntity.setArticlePublishedCount(summaryDTO.getArticlePublishedCount()); + gridDailyEntity.setPublishedCount(summaryDTO.getPublishedCount()); + //同一个机关下数据累加 + buildAgencySummaryData(agencySummaryMap, summaryDTO); } - gridDailyEntity.setArticleTotalCount(summaryDTO.getArticleTotalCount()); - gridDailyEntity.setArticlePublishedCount(summaryDTO.getArticlePublishedCount()); - //同一个机关下数据累加 - buildAgencySummaryData(agencySummaryMap, summaryDTO); } + boolean b = factArticlePublishedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), gridDailyEntityMap.values()); + } catch (Exception e) { + log.error("statsPublishedGridDaily exception customerId:{},statsDate:{}", customerId, statsDate); } - boolean b = factArticlePublishedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), gridDailyEntityMap.values()); }); } - private void statsPublishedAgencyDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map agencySummaryMap) { + private void statsPublishedAgencyDaily(String statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId, Map agencySummaryMap) { //获取所有机关 List agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId); if (CollectionUtils.isEmpty(agencyDTOList)) { @@ -434,6 +444,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { return; } executorService.submit(() -> { + try { //转换为 需要插入的Entity Map agencyDailyEntityMap = convertAgencyDailyEntity(agencyDTOList, dimIdBean); //获取当天的业务数据 @@ -449,6 +460,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { } gridDailyEntities.setArticleTotalCount(summaryDTO.getArticleTotalCount()); gridDailyEntities.setArticlePublishedCount(summaryDTO.getArticlePublishedCount()); + gridDailyEntities.setPublishedCount(summaryDTO.getPublishedCount()); haveDataAgencyDailyMap.put(summaryDTO.getAgencyId(), gridDailyEntities); //同一个机关下数据累加 //buildAgencySummaryData(agencySummaryMap, summaryDTO); @@ -459,6 +471,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { selfDaily.setAgencyId(summaryDTO.getAgencyId().concat(DimAgencyConstant.TYPE_SELF_ID_SUFFIX)); selfDaily.setArticleTotalCount(summaryDTO.getArticleTotalCount()); selfDaily.setArticlePublishedCount(summaryDTO.getArticlePublishedCount()); + selfDaily.setPublishedCount(summaryDTO.getPublishedCount()); haveDataAgencyDailySelfMap.put(selfDaily.getAgencyId(), selfDaily); } } @@ -479,7 +492,12 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { if (!CollectionUtils.isEmpty(haveDataAgencyDailySelfMap)) { agencyDailyEntityMap.putAll(haveDataAgencyDailySelfMap); } + log.debug("statsPublishedAgencyDaily insert:{}",JSON.toJSONString(agencyDailyEntityMap.values())); boolean b = factArticlePublishedAgencyDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), agencyDailyEntityMap.values()); + } catch (Exception e) { + e.printStackTrace(); + log.error("statsPublishedAgencyDaily exception,customer:{}",customerId); + } }); } @@ -492,77 +510,85 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { * @param customerId */ private void statsTagUsedDaily(Date statsDate, DimIdGenerator.DimIdBean dimIdBean, String customerId) { - //1.业务数据来源 发布时间为统计时间的 - // 因为一个客户的发布文章数在同一天不会特别的多，所以以客户为单位查询今天发布的所有带有标签的文章 根据发布单位类型进行拆分 - // 1.1查出今天所有的文章标签 根据网格Id - // 1.2 - //获取所有网格 - List agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId); - if (CollectionUtils.isEmpty(agencyDTOList)) { - log.warn("publicitySummary getAgencyListByCustomerId return empty,customerId:{}", customerId); - return; - } - //转换为 需要插入的Entity - Map dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o)); - //转换为 需要插入的Entity key gridId_tagId - Map tagUsedGridDailyMap = new HashMap<>(); - Map tagUsedDeptDailyMap = new HashMap<>(); - Map tagUsedAgencyDailyMap = new HashMap<>(); - Map tagUsedAgencyDailySelfMap = new HashMap<>(); - //获取当天的业务数据 - //1获取文章及机关id,网格Id - List publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, statsDate); - if (CollectionUtils.isEmpty(publishedArticleList)) { - return; - } - //KEY 文章Id - Map articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o)); - Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN); - Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN); - //2 获取文章标签 - List articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime); - if (CollectionUtils.isEmpty(articleTagsList)) { - log.error("publicitySummary getArticleTagsByCreateTime customerId:{} have not articleTags,publishedArticleList:{}", customerId, JSON.toJSONString(publishedArticleList)); - return; - } - //tagId - for (ArticleTagsEntity tagEntity : articleTagsList) { - ArticleEntity articleEntity = articleMap.get(tagEntity.getArticleId()); - if (articleEntity == null) { - log.error("publicitySummary articleMap articleId:{} ", tagEntity.getArticleId()); + try { + //1.业务数据来源 发布时间为统计时间的 + // 因为一个客户的发布文章数在同一天不会特别的多，所以以客户为单位查询今天发布的所有带有标签的文章 根据发布单位类型进行拆分 + // 1.1查出今天所有的文章标签 根据网格Id + // 1.2 + //获取所有网格 + List agencyDTOList = dimAgencyService.getAgencyListByCustomerId(customerId); + if (CollectionUtils.isEmpty(agencyDTOList)) { + log.warn("publicitySummary getAgencyListByCustomerId return empty,customerId:{}", customerId); return; } - DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(articleEntity.getOrgId()); - convertTagUsedAgencyDailyEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailyMap, articleEntity, tagEntity, dimIdBean); - switch (articleEntity.getPublisherType()) { - case ProjectConstant.PUBLISHER_TYPE_GRID: - convertTagUsedGridDailyEntity(tagUsedGridDailyMap, articleEntity, tagEntity, dimIdBean); - break; - case ProjectConstant.PUBLISHER_TYPE_DEPT: - convertTagUsedDepartmentDailyEntity(tagUsedDeptDailyMap, articleEntity, tagEntity, dimIdBean); - break; - case ProjectConstant.PUBLISHER_TYPE_AGENCY: - convertTagUsedAgencyDailySelfEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailySelfMap, articleEntity, tagEntity, dimIdBean); - break; + //转换为 需要插入的Entity + Map dimAgencyEntityMap = agencyDTOList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o)); + //转换为 需要插入的Entity key gridId_tagId + Map tagUsedGridDailyMap = new HashMap<>(); + Map tagUsedDeptDailyMap = new HashMap<>(); + Map tagUsedAgencyDailyMap = new HashMap<>(); + Map tagUsedAgencyDailySelfMap = new HashMap<>(); + //获取当天的业务数据 + //1获取文章及机关id,网格Id + List publishedArticleList = articleService.getPublishedArticleByPublishTime(customerId, DateUtils.format(statsDate)); + if (CollectionUtils.isEmpty(publishedArticleList)) { + return; + } + //KEY 文章Id + Map articleMap = publishedArticleList.stream().collect(Collectors.toMap(ArticleEntity::getId, o -> o)); + Date startTime = DateUtils.integrate(statsDate, DateUtils.DATE_PATTERN); + Date endTime = DateUtils.integrate(DateUtils.addDateDays(statsDate, 1), DateUtils.DATE_PATTERN); + //2 获取文章标签 + List articleTagsList = articleTagsService.getArticleTagsByCreateTime(customerId, startTime, endTime); + if (CollectionUtils.isEmpty(articleTagsList)) { + log.error("publicitySummary getArticleTagsByCreateTime customerId:{} have not articleTags,publishedArticleList:{}", customerId, JSON.toJSONString(publishedArticleList)); + return; + } + //tagId + for (ArticleTagsEntity tagEntity : articleTagsList) { + ArticleEntity articleEntity = articleMap.get(tagEntity.getArticleId()); + if (articleEntity == null) { + log.error("publicitySummary articleMap articleId:{} ", tagEntity.getArticleId()); + return; + } + DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(articleEntity.getOrgId()); + convertTagUsedAgencyDailyEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailyMap, articleEntity, tagEntity, dimIdBean); + switch (articleEntity.getPublisherType()) { + case ProjectConstant.PUBLISHER_TYPE_GRID: + convertTagUsedGridDailyEntity(tagUsedGridDailyMap, articleEntity, tagEntity, dimIdBean); + break; + case ProjectConstant.PUBLISHER_TYPE_DEPT: + convertTagUsedDepartmentDailyEntity(tagUsedDeptDailyMap, articleEntity, tagEntity, dimIdBean); + break; + case ProjectConstant.PUBLISHER_TYPE_AGENCY: + convertTagUsedAgencyDailySelfEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailySelfMap, articleEntity, tagEntity, dimIdBean); + break; + } } - } - factTagUsedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), tagUsedGridDailyMap.values()); - factTagUsedDepartmentDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), tagUsedDeptDailyMap.values()); - //向上级机关递归添加 数据 - Map finalTagUsedAgencyDailyMap = new HashMap<>(); - finalTagUsedAgencyDailyMap.putAll(tagUsedAgencyDailyMap); - for (Map.Entry entry : tagUsedAgencyDailyMap.entrySet()) { - String agencyId = entry.getKey().split(StrConstant.UNDER_LINE)[0]; - FactTagUsedAgencyDailyEntity currentEntity = entry.getValue(); - DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(currentEntity.getAgencyId()); - if (dimAgencyEntity == null) { - log.error("dimAgencyEntityMap bizData agencyId:{} not exist in dimAgency", agencyId); - continue; + factTagUsedGridDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), tagUsedGridDailyMap.values()); + factTagUsedDepartmentDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), tagUsedDeptDailyMap.values()); + //向上级机关递归添加 数据 + Map finalTagUsedAgencyDailyMap = new HashMap<>(); + finalTagUsedAgencyDailyMap.putAll(tagUsedAgencyDailyMap); + for (Map.Entry entry : tagUsedAgencyDailyMap.entrySet()) { + String agencyId = entry.getKey().split(StrConstant.UNDER_LINE)[0]; + FactTagUsedAgencyDailyEntity currentEntity = entry.getValue(); + DimAgencyEntity dimAgencyEntity = dimAgencyEntityMap.get(currentEntity.getAgencyId()); + if (dimAgencyEntity == null) { + log.error("dimAgencyEntityMap bizData agencyId:{} not exist in dimAgency", agencyId); + continue; + } + setTagUsedData2ParentAgency(dimAgencyEntityMap, finalTagUsedAgencyDailyMap, currentEntity, dimIdBean); + } + if (!CollectionUtils.isEmpty(tagUsedAgencyDailySelfMap)){ + finalTagUsedAgencyDailyMap.putAll(tagUsedAgencyDailySelfMap); } - setTagUsedData2ParentAgency(dimAgencyEntityMap, finalTagUsedAgencyDailyMap, currentEntity, dimIdBean); + factTagUsedAgencyDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), finalTagUsedAgencyDailyMap.values()); + } catch (Exception e) { + e.printStackTrace(); + //log.error(); } - factTagUsedAgencyDailyService.deleteAndInsertBatch(customerId, dimIdBean.getDateId(), finalTagUsedAgencyDailyMap.values()); } /** @@ -610,7 +636,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { if (CollectionUtils.isEmpty(articleTagsList)) { continue; } - ArticleEntity articleEntity = articleService.selectById(viewedSummaryDTO.getArticleId()); + ArticleEntity articleEntity = articleService.selectArticleById(viewedSummaryDTO.getArticleId()); if (articleEntity == null) { continue; } @@ -850,6 +876,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { } parentAgency.setArticleTotalCount(parentAgency.getArticleTotalCount() + agencySummary.getArticleTotalCount()); parentAgency.setArticlePublishedCount(parentAgency.getArticlePublishedCount() + agencySummary.getArticlePublishedCount()); + parentAgency.setPublishedCount(parentAgency.getPublishedCount() + agencySummary.getPublishedCount()); pid = parentAgency.getPid(); if (!NumConstant.ZERO_STR.equals(pid)) { setPublishedData2ParentAgency(agencyDailyEntityMap, agencySummary, parentAgency); @@ -872,6 +899,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { entity.setGridId(dimGridEntity.getId()); entity.setArticleTotalCount(0); entity.setArticlePublishedCount(0); + entity.setPublishedCount(0); result.put(dimGridEntity.getId(), entity); }); return result; @@ -893,6 +921,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { entity.setDepartmentId(dimGridEntity.getId()); entity.setArticleTotalCount(0); entity.setArticlePublishedCount(0); + entity.setPublishedCount(0); result.put(dimGridEntity.getId(), entity); }); return result; @@ -914,6 +943,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { entity.setAgencyId(dimGridEntity.getId()); entity.setArticleTotalCount(0); entity.setArticlePublishedCount(0); + entity.setPublishedCount(0); result.put(dimGridEntity.getId(), entity); }); return result; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedAgencyDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedAgencyDailyServiceImpl.java index 48d8bbe0f7..9068ca2bdb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedAgencyDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedAgencyDailyServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.stats.impl; +import com.alibaba.fastjson.JSON; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.dao.stats.FactArticlePublishedAgencyDailyDao; import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity; @@ -47,6 +48,7 @@ public class FactArticlePublishedAgencyDailyServiceImpl extends BaseServiceImpl< } int i = baseDao.deleteByDateId(customerId, dateId); log.debug("deleteAndInsertBatch delete customerId:{},rows:{}", customerId,i); + log.debug("deleteAndInsertBatch insert customerId:{},values:{}", customerId, JSON.toJSONString(values)); this.insertBatch(values, 100); return true; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleOperateRecordService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleOperateRecordService.java new file mode 100644 index 0000000000..3a63203083 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleOperateRecordService.java @@ -0,0 +1,31 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.voice; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.entity.voice.ArticleOperateRecordEntity; + +/** + * 文章操作记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-06-17 + */ +public interface ArticleOperateRecordService extends BaseService { + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java index 5477d54cd2..ce6025a17a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticleService.java @@ -21,7 +21,6 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.voice.ArticleGridPublishedSummaryDTO; import com.epmet.entity.voice.ArticleEntity; -import java.util.Date; import java.util.List; /** @@ -40,27 +39,29 @@ public interface ArticleService extends BaseService { * @param publishDate * @return */ - List getAllDepartmentPublishedCount(String customerId, Date publishDate); + List getAllDepartmentPublishedCount(String customerId, String publishDate); /** * desc:根据客户id、发布时间 获取文章总数 * @param customerId * @param publishDate * @return */ - List getAllAgencyPublishedCount(String customerId, Date publishDate); + List getAllAgencyPublishedCount(String customerId, String publishDate); /** * desc:根据客户id、发布时间 获取文章总数 * @param customerId * @param publishDate * @return */ - List getAllGridPublishedCount(String customerId, Date publishDate); + List getAllGridPublishedCount(String customerId, String publishDate); /** * desc：根据客户id，发布时间 获取文章数据 * @param customerId - * @param statsDate + * @param publishDate * @return */ - List getPublishedArticleByPublishTime(String customerId, Date statsDate); + List getPublishedArticleByPublishTime(String customerId, String publishDate); + + ArticleEntity selectArticleById(String articleId); } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleOperateRecordServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleOperateRecordServiceImpl.java new file mode 100644 index 0000000000..f1d464824f --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleOperateRecordServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.service.voice.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.constant.DataSourceConstant; +import com.epmet.dao.voice.ArticleOperateRecordDao; +import com.epmet.entity.voice.ArticleOperateRecordEntity; +import com.epmet.service.voice.ArticleOperateRecordService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 文章操作记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-06-17 + */ +@Slf4j +@Service +@DataSource(DataSourceConstant.GOV_VOICE) +public class ArticleOperateRecordServiceImpl extends BaseServiceImpl implements ArticleOperateRecordService { + +} \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java index 08ce42e396..2a9bd8d17e 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticleServiceImpl.java @@ -30,7 +30,6 @@ import com.epmet.service.voice.ArticleService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; /** @@ -44,19 +43,19 @@ import java.util.List; public class ArticleServiceImpl extends BaseServiceImpl implements ArticleService { @Override - public List getAllDepartmentPublishedCount(String customerId, Date publishDate) { + public List getAllDepartmentPublishedCount(String customerId, String publishDate) { checkParam(customerId, publishDate); return baseDao.getAllPublishedCount(customerId,publishDate, ProjectConstant.PUBLISHER_TYPE_DEPT); } @Override - public List getAllAgencyPublishedCount(String customerId, Date publishDate) { + public List getAllAgencyPublishedCount(String customerId, String publishDate) { checkParam(customerId, publishDate); return baseDao.getAllPublishedCount(customerId,publishDate, ProjectConstant.PUBLISHER_TYPE_AGENCY); } @Override - public List getAllGridPublishedCount(String customerId, Date publishDate) { + public List getAllGridPublishedCount(String customerId, String publishDate) { checkParam(customerId, publishDate); return baseDao.getAllPublishedCount(customerId,publishDate, ProjectConstant.PUBLISHER_TYPE_GRID); } @@ -64,13 +63,21 @@ public class ArticleServiceImpl extends BaseServiceImpl getPublishedArticleByPublishTime(String customerId, Date publishDate) { + public List getPublishedArticleByPublishTime(String customerId, String publishDate) { checkParam(customerId, publishDate); - return baseDao.getPublishedArticleByDay(customerId,publishDate, ProjectConstant.PUBLISHER_TYPE_GRID); + return baseDao.getPublishedArticleByDay(customerId,publishDate); } - private void checkParam(String customerId, Date publishDate) { - if (StringUtils.isBlank(customerId) || publishDate == null) { + @Override + public ArticleEntity selectArticleById(String articleId) { + if (StringUtils.isBlank(articleId)){ + throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); + } + return baseDao.selectById(articleId); + } + + private void checkParam(String customerId, String publishDate) { + if (StringUtils.isBlank(customerId) || StringUtils.isBlank(publishDate)) { throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(), EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg()); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/data_statistical.sql b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/data_statistical.sql index cd25dce6a9..81f9cb98f1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/data_statistical.sql +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/data_statistical.sql @@ -25,10 +25,11 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `fact_article_published_agency_daily`; CREATE TABLE `fact_article_published_agency_daily` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', `ARTICLE_TOTAL_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章累计发文数量 文章数量', + `PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '今日发布文章数', `ARTICLE_PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '当前发文数量 当前未下线的文章数量', `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 日期ID', `WEEK_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周ID 周ID eg：2020W01 = 2020年第一周', @@ -50,10 +51,11 @@ CREATE TABLE `fact_article_published_agency_daily` ( DROP TABLE IF EXISTS `fact_article_published_department_daily`; CREATE TABLE `fact_article_published_department_daily` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布文章单位所属机关ID 发布文章单位所属机关ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布文章单位所属机关ID 发布文章单位所属机关ID', `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID', `ARTICLE_TOTAL_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章累计发文数量 文章数量', + `PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '今日发布文章数', `ARTICLE_PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '当前发文数量 当前未下线的文章数量', `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 日期ID', `WEEK_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周ID 周ID eg：2020W01 = 2020年第一周', @@ -75,10 +77,11 @@ CREATE TABLE `fact_article_published_department_daily` ( DROP TABLE IF EXISTS `fact_article_published_grid_daily`; CREATE TABLE `fact_article_published_grid_daily` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布单位所属机关ID 发布单位所属机关ID', - `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '发布单位所属机关ID 发布单位所属机关ID', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', `ARTICLE_TOTAL_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章累计发文数量 文章数量', + `PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '今日发布文章数', `ARTICLE_PUBLISHED_COUNT` int(11) NULL DEFAULT NULL COMMENT '当前发文数量 当前未下线的文章数量', `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 日期ID', `WEEK_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周ID 周ID eg：2020W01 = 2020年第一周', @@ -93,17 +96,16 @@ CREATE TABLE `fact_article_published_grid_daily` ( `UPDATED_TIME` datetime(0) NULL DEFAULT NULL COMMENT '更新时间', PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '文章发布数量【网格】日统计表' ROW_FORMAT = Dynamic; - -- ---------------------------- -- Table structure for fact_tag_used_agency_daily -- ---------------------------- DROP TABLE IF EXISTS `fact_tag_used_agency_daily`; CREATE TABLE `fact_tag_used_agency_daily` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天ID eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日', @@ -126,10 +128,10 @@ CREATE TABLE `fact_tag_used_agency_daily` ( DROP TABLE IF EXISTS `fact_tag_used_agency_monthly`; CREATE TABLE `fact_tag_used_agency_monthly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID eg：202006 = 2020年6月、202007 = 2020年7月', @@ -150,11 +152,11 @@ CREATE TABLE `fact_tag_used_agency_monthly` ( DROP TABLE IF EXISTS `fact_tag_used_agency_quarterly`; CREATE TABLE `fact_tag_used_agency_quarterly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', - `TAG_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度', `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID eg：2020 = 2020年、2021 = 2021年', @@ -173,10 +175,10 @@ CREATE TABLE `fact_tag_used_agency_quarterly` ( DROP TABLE IF EXISTS `fact_tag_used_agency_yearly`; CREATE TABLE `fact_tag_used_agency_yearly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID eg：2020 = 2020年、2021 = 2021年', @@ -195,11 +197,11 @@ CREATE TABLE `fact_tag_used_agency_yearly` ( DROP TABLE IF EXISTS `fact_tag_used_department_daily`; CREATE TABLE `fact_tag_used_department_daily` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID', - `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID', + `DEPARTMENT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天ID eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日', @@ -222,10 +224,10 @@ CREATE TABLE `fact_tag_used_department_daily` ( DROP TABLE IF EXISTS `fact_tag_used_department_monthly`; CREATE TABLE `fact_tag_used_department_monthly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `DEPARTMENT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID eg：202006 = 2020年6月、202007 = 2020年7月', @@ -246,11 +248,11 @@ CREATE TABLE `fact_tag_used_department_monthly` ( DROP TABLE IF EXISTS `fact_tag_used_department_quarterly`; CREATE TABLE `fact_tag_used_department_quarterly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', - `TAG_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `DEPARTMENT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度', `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID eg：2020 = 2020年、2021 = 2021年', @@ -269,10 +271,10 @@ CREATE TABLE `fact_tag_used_department_quarterly` ( DROP TABLE IF EXISTS `fact_tag_used_department_yearly`; CREATE TABLE `fact_tag_used_department_yearly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `DEPARTMENT_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `DEPARTMENT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID eg：2020 = 2020年、2021 = 2021年', @@ -291,10 +293,10 @@ CREATE TABLE `fact_tag_used_department_yearly` ( DROP TABLE IF EXISTS `fact_tag_used_grid_daily`; CREATE TABLE `fact_tag_used_grid_daily` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天ID eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日', @@ -317,10 +319,10 @@ CREATE TABLE `fact_tag_used_grid_daily` ( DROP TABLE IF EXISTS `fact_tag_used_grid_monthly`; CREATE TABLE `fact_tag_used_grid_monthly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID eg：2020-06 = 2020年6月、2020-07 = 2020年7月', @@ -341,11 +343,11 @@ CREATE TABLE `fact_tag_used_grid_monthly` ( DROP TABLE IF EXISTS `fact_tag_used_grid_quarterly`; CREATE TABLE `fact_tag_used_grid_quarterly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', - `TAG_NAME` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度', `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID eg：2020 = 2020年、2021 = 2021年', @@ -364,10 +366,10 @@ CREATE TABLE `fact_tag_used_grid_quarterly` ( DROP TABLE IF EXISTS `fact_tag_used_grid_yearly`; CREATE TABLE `fact_tag_used_grid_yearly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `USED_COUNT` int(11) NULL DEFAULT NULL COMMENT '标签使用次数 标签的使用次数', `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID eg：2020 = 2020年、2021 = 2021年', @@ -386,10 +388,10 @@ CREATE TABLE `fact_tag_used_grid_yearly` ( DROP TABLE IF EXISTS `fact_tag_viewed_agency_daily`; CREATE TABLE `fact_tag_viewed_agency_daily` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数', `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天数ID eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日', @@ -412,10 +414,10 @@ CREATE TABLE `fact_tag_viewed_agency_daily` ( DROP TABLE IF EXISTS `fact_tag_viewed_agency_monthly`; CREATE TABLE `fact_tag_viewed_agency_monthly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数', `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID eg：2020-06 = 2020年6月、2020-07 = 2020年7月', @@ -436,10 +438,10 @@ CREATE TABLE `fact_tag_viewed_agency_monthly` ( DROP TABLE IF EXISTS `fact_tag_viewed_agency_quarterly`; CREATE TABLE `fact_tag_viewed_agency_quarterly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数', `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度', @@ -459,10 +461,10 @@ CREATE TABLE `fact_tag_viewed_agency_quarterly` ( DROP TABLE IF EXISTS `fact_tag_viewed_agency_yearly`; CREATE TABLE `fact_tag_viewed_agency_yearly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `PID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '上级机关ID 上级机关ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '机关ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数', `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID eg：2020 = 2020年、2021 = 2021年', @@ -481,10 +483,10 @@ CREATE TABLE `fact_tag_viewed_agency_yearly` ( DROP TABLE IF EXISTS `fact_tag_viewed_grid_daily`; CREATE TABLE `fact_tag_viewed_grid_daily` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数', `DATE_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '日期ID 天数ID eg：20200601 = 2020年6月1日、20200602 = 2020年6月2日', @@ -507,10 +509,10 @@ CREATE TABLE `fact_tag_viewed_grid_daily` ( DROP TABLE IF EXISTS `fact_tag_viewed_grid_monthly`; CREATE TABLE `fact_tag_viewed_grid_monthly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数', `MONTH_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '月份ID 月份ID eg：2020-06 = 2020年6月、2020-07 = 2020年7月', @@ -531,10 +533,10 @@ CREATE TABLE `fact_tag_viewed_grid_monthly` ( DROP TABLE IF EXISTS `fact_tag_viewed_grid_quarterly`; CREATE TABLE `fact_tag_viewed_grid_quarterly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数', `QUARTER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '季度ID 季度ID eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度', @@ -554,10 +556,10 @@ CREATE TABLE `fact_tag_viewed_grid_quarterly` ( DROP TABLE IF EXISTS `fact_tag_viewed_grid_yearly`; CREATE TABLE `fact_tag_viewed_grid_yearly` ( `ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT 'ID ID', - `CUSTOMER_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', - `AGENCY_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', - `GRID_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', - `TAG_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', + `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '客户ID 客户ID', + `AGENCY_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '文章发布所属机关ID 文章发布所属机关ID', + `GRID_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格ID', + `TAG_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签ID 标签ID', `TAG_NAME` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标签名称 标签名称', `TAG_READ_COUNT` int(11) NULL DEFAULT NULL COMMENT '文章引用标签阅读数 文章引用标签阅读数', `YEAR_ID` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '年度ID 年度ID eg：2020 = 2020年、2021 = 2021年', diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml index a5fca9a9dc..0ecf25fb1b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleDao.xml @@ -34,12 +34,21 @@ ORG_ID AS agencyId, PUBLISHER_ID, count(ID) articleTotalCount, - sum( CASE STATUS_FLAG WHEN 'published' THEN 1 ELSE 0 END ) articlePublishedCount + sum( + CASE + WHEN STATUS_FLAG = 'published' THEN 1 + WHEN STATUS_FLAG = 'offline' AND date_format(OFF_LINE_TIME,'%Y-%m-%d') = #{publishDate,jdbcType=VARCHAR} THEN 1 + ELSE 0 END ) articlePublishedCount, + sum( + CASE PUBLISH_DATE + WHEN #{publishDate,jdbcType=VARCHAR} THEN 1 + ELSE 0 END + ) publishedCount FROM article WHERE CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} - AND PUBLISH_DATE + AND PUBLISH_DATE AND DEL_FLAG = 0 AND PUBLISHER_TYPE = #{publisherType,jdbcType=VARCHAR} GROUP BY @@ -56,11 +65,10 @@ FROM article WHERE - PUBLISH_DATE = #{publishDate,jdbcType=TIMESTAMP} + PUBLISH_DATE = #{publishDate,jdbcType=VARCHAR} AND DEL_FLAG = 0 AND TAGS IS NOT NULL - AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR - AND PUBLISHER_TYPE = #{publisherType,jdbcType=VARCHAR} + AND CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleOperateRecordDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleOperateRecordDao.xml new file mode 100644 index 0000000000..3f2966b179 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/voice/ArticleOperateRecordDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From b8dcdbbb54b53a6b6e4cb7361d6b3c2a09d8998d Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 23 Jun 2020 19:46:12 +0800 Subject: [PATCH 21/34] =?UTF-8?q?job=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/StatsGroupServiceImpl.java | 2 ++ .../java/com/epmet/service/impl/StatsProjectServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index babf60f42b..1e3b04f89e 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -4,11 +4,13 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.service.StatsGroupService; import feign.DataStatisticalOpenFeignClient; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; /** * @Author zxc * @CreateTime 2020/6/22 14:13 */ +@Service public class StatsGroupServiceImpl implements StatsGroupService { @Autowired diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index 0245c79754..a02ad6fc11 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -4,11 +4,13 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.service.StatsProjectService; import feign.DataStatisticalOpenFeignClient; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; /** * @Description 数据统计-项目-机关、网格日月统计任务接口 * @Author sun */ +@Service public class StatsProjectServiceImpl implements StatsProjectService { @Autowired From e263901e232dba8aab5b12b5aa3ec3835e6c287f Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 23 Jun 2020 19:57:44 +0800 Subject: [PATCH 22/34] =?UTF-8?q?job=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/constant/ServiceConstant.java | 2 +- .../feign/DataStatisticalOpenFeignClient.java | 131 +++++++++++++++++ ...ataStatisticalOpenFeignClientFallBack.java | 135 ++++++++++++++++++ .../service/impl/StatsGroupServiceImpl.java | 2 +- .../service/impl/StatsIssueServiceImpl.java | 2 +- .../service/impl/StatsProjectServiceImpl.java | 2 +- .../impl/StatsPublicityTaskServiceImpl.java | 2 +- 7 files changed, 271 insertions(+), 5 deletions(-) create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java create mode 100644 epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java index cf84ae177f..a8a569100d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java @@ -117,5 +117,5 @@ public interface ServiceConstant { /** * 数据统计 */ - String DATA_STATISTICAL = "data_statistical"; + String DATA_STATISTICAL = "data-statistical-server"; } 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 new file mode 100644 index 0000000000..3f1c24b472 --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java @@ -0,0 +1,131 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBack; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * desc: 数据统计 对外feign client + * + * @return: + * @date: 2020/6/22 17:39 + * @author: jianjun liu + */ +@FeignClient(name = ServiceConstant.DATA_STATISTICAL, fallback = DataStatisticalOpenFeignClientFallBack.class) +public interface DataStatisticalOpenFeignClient { + + /** + * desc: 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/articleSummaryDailyStatsjob") + Result articleSummaryDailyStatsjob(); + + /** + * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 + * + * @return: + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagUsedDailyStatsjob") + Result tagUsedDailyStatsjob(); + + /** + * desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagUsedMonthlyStatsjob") + Result tagUsedMonthlyStatsjob(); + + /** + * desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagUsedQuarterlyStatsjob") + Result tagUsedQuarterlyStatsjob(); + + /** + * desc: 【日】 统计阅读最多的标签 包含 机关 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagViewedDailyStatsjob") + Result tagViewedDailyStatsjob(); + + /** + * desc: 【月】 统计阅读最多的标签 包含 机关 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagViewedMonthlyStatsjob") + Result tagViewedMonthlyStatsjob(); + + /** + * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @PostMapping(value = "data/stats/statspublicity/tagViewedQuarterlyStatsjob") + Result tagViewedQuarterlyStatsjob(); + + /** + * @Description 统计 “网格小组”， dim：【网格-日】 + * @param + * @author zxc + */ + @PostMapping("/data/stats/statsgroup/groupgriddaily") + Result groupGridDaily(); + + /** + * @Description 统计 “网格小组”， dim：【机关-日】 + * @param + * @author zxc + */ + @PostMapping("/data/stats/statsgroup/groupagencydaily") + Result groupAgencyDaily(); + + /** + * @Description 统计 “网格小组”， dim：【机关-月】 + * @param + * @author zxc + */ + @PostMapping("/data/stats/statsgroup/groupagencymonthly") + Result groupAgencyMonthly(); + + /** + * 议题统计 + * @author zhaoqifeng + * @date 2020/6/23 14:34 + * @param + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("/data/stats/statsissue/issuestats") + Result agencyGridIssueStats(); + + /** + * @Description 数据统计-项目-机关日月统计 + * @Author sun + */ + @PostMapping("/data/stats/statsproject/agencyprojectstats") + Result agencyProjectStats(); + + /** + * @Description 数据统计-项目-网格日月统计 + * @Author sun + */ + @PostMapping("/data/stats/statsproject/gridprojectstats") + Result gridProjectStats(); + +} diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java new file mode 100644 index 0000000000..d7e486b79a --- /dev/null +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java @@ -0,0 +1,135 @@ +package com.epmet.feign.impl; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.DataStatisticalOpenFeignClient; +import org.springframework.stereotype.Component; + +/** + * desc: + * + * @return: + * @date: 2020/6/22 9:38 + * @author: jianjun liu + * email:liujianjun@git.elinkit.com.cn + */ +@Component +public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOpenFeignClient { + + /** + * desc: 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @Override + public Result articleSummaryDailyStatsjob() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "articleSummaryDailyStatsjob"); + } + + /** + * desc: 定时任务 【日】统计文章总数及在线文章总数 包含 机关 部门 网格 + * + * @return: + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @Override + public Result tagUsedDailyStatsjob() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagUsedDailyStatsjob"); + } + + /** + * desc: 【月】 统计发表文章最多的分类 包含 机关 部门 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @Override + public Result tagUsedMonthlyStatsjob() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagUsedMonthlyStatsjob"); + } + + /** + * desc: 【季，年】 统计发表文章最多的分类 包含 机关 部门 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @Override + public Result tagUsedQuarterlyStatsjob() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagUsedQuarterlyStatsjob"); + } + + /** + * desc: 【日】 统计阅读最多的标签 包含 机关 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @Override + public Result tagViewedDailyStatsjob() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagViewedDailyStatsjob"); + } + + /** + * desc: 【月】 统计阅读最多的标签 包含 机关 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @Override + public Result tagViewedMonthlyStatsjob() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagViewedMonthlyStatsjob"); + } + + /** + * desc: 【季，年】 统计阅读最多的标签 包含 机关 网格 + * + * @date: 2020/6/22 9:09 + * @author: jianjun liu + */ + @Override + public Result tagViewedQuarterlyStatsjob() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "tagViewedQuarterlyStatsjob"); + } + + @Override + public Result groupGridDaily() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "groupGridDaily"); + } + + @Override + public Result groupAgencyDaily() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "groupAgencyDaily"); + } + + @Override + public Result groupAgencyMonthly() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "groupAgencyMonthly"); + } + + @Override + public Result agencyGridIssueStats() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "agencyGridIssueStats"); + } + + /** + * @Description 数据统计-项目-机关日月统计 + * @Author sun + */ + @Override + public Result agencyProjectStats() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "agencyProjectStats"); + } + + /** + * @Description 数据统计-项目-网格日月统计 + * @Author sun + */ + @Override + public Result gridProjectStats() { + return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL, "gridProjectStats"); + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java index 1e3b04f89e..4aec7898dd 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java @@ -2,7 +2,7 @@ package com.epmet.service.impl; import com.epmet.commons.tools.utils.Result; import com.epmet.service.StatsGroupService; -import feign.DataStatisticalOpenFeignClient; +import com.epmet.feign.DataStatisticalOpenFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java index a8803c5f5e..a6415241cf 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsIssueServiceImpl.java @@ -2,7 +2,7 @@ package com.epmet.service.impl; import com.epmet.commons.tools.utils.Result; import com.epmet.service.StatsIssueService; -import feign.DataStatisticalOpenFeignClient; +import com.epmet.feign.DataStatisticalOpenFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java index a02ad6fc11..0fb06aa23c 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java @@ -2,7 +2,7 @@ package com.epmet.service.impl; import com.epmet.commons.tools.utils.Result; import com.epmet.service.StatsProjectService; -import feign.DataStatisticalOpenFeignClient; +import com.epmet.feign.DataStatisticalOpenFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPublicityTaskServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPublicityTaskServiceImpl.java index 6abfabaaa7..40368b169b 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPublicityTaskServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsPublicityTaskServiceImpl.java @@ -2,7 +2,7 @@ package com.epmet.service.impl; import com.epmet.commons.tools.utils.Result; import com.epmet.service.StatsPublicityTaskService; -import feign.DataStatisticalOpenFeignClient; +import com.epmet.feign.DataStatisticalOpenFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; From f926fe4d6bc7874d5d9d47c6b59111cc4669cd49 Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 23 Jun 2020 19:59:50 +0800 Subject: [PATCH 23/34] =?UTF-8?q?job=E6=9C=8D=E5=8A=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-job/epmet-job-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-job/epmet-job-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml index e6b1bc05c5..c56d2e0cfd 100644 --- a/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-job-server: container_name: epmet-job-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.8 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-job-server:0.3.9 ports: - "8084:8084" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 3a9a14c5c8..295e3985c4 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.8 + 0.3.9 com.epmet epmet-job From 61c6dd54e12d73904722ce700ed6006f862e741f Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 23 Jun 2020 21:28:34 +0800 Subject: [PATCH 24/34] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1task?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/PublicityTagUsedDailyStatsTask.java | 2 +- .../PublicityTagUsedMonthlyStatsTask.java | 2 +- ...ityTagUsedQuarterlyAndYearlyStatsTask.java | 31 +++++++++++++++++++ ...gViewedQuarterlyAndYearlyhlyStatsTask.java | 31 +++++++++++++++++++ .../src/main/resources/readme | 6 +++- 5 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java index 2d850980a4..ef5b147ac8 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedDailyStatsTask.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; /** * desc:标签被使用次数 日统计定时任务 */ -@Component("publicityTagUsedDailyStatsjob") +@Component("publicityTagUsedDailyStatsTask") public class PublicityTagUsedDailyStatsTask implements ITask { private Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java index df99756776..c0a7862b90 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedMonthlyStatsTask.java @@ -10,7 +10,7 @@ import org.springframework.stereotype.Component; /** * desc:标签被使用次数 【月、季、年】统计定时任务 */ -@Component("publicityTagUsedMonthlyStatsjob") +@Component("publicityTagUsedMonthlyStatsTask") public class PublicityTagUsedMonthlyStatsTask implements ITask { private Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java new file mode 100644 index 0000000000..a9a816139c --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagUsedQuarterlyAndYearlyStatsTask.java @@ -0,0 +1,31 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.StatsPublicityTaskService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * desc:标签被使用次数 【月、季、年】统计定时任务 + */ +@Component("publicityTagUsedQuarterlyAndYearlyStatsTask") +public class PublicityTagUsedQuarterlyAndYearlyStatsTask implements ITask { + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private StatsPublicityTaskService statsPublicityTaskService; + + + @Override + public void run(String params) { + logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行，参数为：{}", params); + Result result = statsPublicityTaskService.tagUsedQuarterlyStatsjob(); + if (result.success()) { + logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行成功"); + } else { + logger.debug("publicityTagUsedMonthlyStatsjob定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java new file mode 100644 index 0000000000..15f52608bd --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PublicityTagViewedQuarterlyAndYearlyhlyStatsTask.java @@ -0,0 +1,31 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.StatsPublicityTaskService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * desc:标签被阅读次数 【月、季、年】统计定时任务 + */ +@Component("publicityTagViewedQuarterlyAndYearlyhlyStatsTask") +public class PublicityTagViewedQuarterlyAndYearlyhlyStatsTask implements ITask { + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private StatsPublicityTaskService statsPublicityTaskService; + + + @Override + public void run(String params) { + logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行，参数为：{}", params); + Result result = statsPublicityTaskService.tagViewedMonthlyStatsjob(); + if (result.success()) { + logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行成功"); + } else { + logger.debug("publicityTagViewedMonthlyStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +} diff --git a/epmet-openapi/epmet-openapi-scan/src/main/resources/readme b/epmet-openapi/epmet-openapi-scan/src/main/resources/readme index 7cb6399fe1..d5a2826ed9 100644 --- a/epmet-openapi/epmet-openapi-scan/src/main/resources/readme +++ b/epmet-openapi/epmet-openapi-scan/src/main/resources/readme @@ -1,4 +1,8 @@ #访问openApi 需要向redis中 添加白名单 sadd epmet:openapi:scan:whitelist "客户端ip地址" #eg: -sadd epmet:openapi:scan:whitelist "\"192.168.1.1\"" \ No newline at end of file +sadd epmet:openapi:scan:whitelist "\"192.168.1.1\"" + +#于洋家的ip +27.219.156.47 +116.179.32.197（可以删除了） \ No newline at end of file From b61e58fdb8127afb342dd417667aba34e075af01 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 21:45:54 +0800 Subject: [PATCH 25/34] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=EF=BC=9A?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=A0=81=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GovLoginServiceImpl.java | 16 ++++--- .../epmet/constant/SmsTemplateConstant.java | 30 +++++++++++++ .../main/java/com/epmet/dto/SysSmsDTO.java | 5 ++- .../dto/form/SendVerificationCodeFormDTO.java | 36 ++++++++++++++++ .../result/SendVerificationCodeResultDTO.java | 19 ++++++++ .../feign/EpmetMessageOpenFeignClient.java | 23 +++++++--- .../EpmetMessageOpenFeignClientFallback.java | 11 ++++- .../com/epmet/controller/SmsController.java | 24 ++++++++--- .../java/com/epmet/service/SysSmsService.java | 16 +++++-- .../epmet/service/impl/SysSmsServiceImpl.java | 43 +++++++++++++++++-- .../com/epmet/sms/AbstractSmsService.java | 13 ++++++ .../java/com/epmet/sms/AliyunSmsService.java | 10 +++++ 12 files changed, 218 insertions(+), 28 deletions(-) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendVerificationCodeFormDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/SendVerificationCodeResultDTO.java diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index b1ad1b2908..45e34e282e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -13,11 +13,13 @@ import com.epmet.commons.tools.utils.CpUserDetailRedis; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.PhoneValidatorUtils; +import com.epmet.constant.SmsTemplateConstant; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.GovStaffRoleDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.jwt.JwtTokenProperties; @@ -57,6 +59,8 @@ public class GovLoginServiceImpl implements GovLoginService { private CpUserDetailRedis cpUserDetailRedis; @Autowired private GovOrgFeignClient govOrgFeignClient; + @Autowired + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; /** * @param formDTO @@ -70,8 +74,7 @@ public class GovLoginServiceImpl implements GovLoginService { //1、校验手机号是否符合规范 if (!PhoneValidatorUtils.isMobile(formDTO.getMobile())) { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), EpmetErrorCode.ERROR_PHONE.getCode(), EpmetErrorCode.ERROR_PHONE.getMsg())); - //TODO 2020-05-21 手机号验证先去掉方便测试 - //throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode()); + throw new RenException(EpmetErrorCode.ERROR_PHONE.getCode()); } //2、根据手机号校验用户是否存在 Result> customerStaffResult = epmetUserFeignClient.checkCustomerStaff(formDTO.getMobile()); @@ -79,14 +82,17 @@ public class GovLoginServiceImpl implements GovLoginService { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), customerStaffResult.getCode(), customerStaffResult.getMsg())); throw new RenException(customerStaffResult.getCode()); } - //3、发送短信验证码 TODO 2020-05-21 发送验证先去掉方便测试 - /*Result> smsCodeResult = messageFeignClient.sendSmsCaptcha(formDTO.getMobile()); + //3、发送短信验证码 + SendVerificationCodeFormDTO sendVerificationCodeFormDTO=new SendVerificationCodeFormDTO(); + sendVerificationCodeFormDTO.setMobile(formDTO.getMobile()); + sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.LGOIN_CONFIRM); + Result smsCodeResult=epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO); if (!smsCodeResult.success()) { logger.error(String.format(SEND_SMS_CODE_ERROR, formDTO.getMobile(), smsCodeResult.getCode(), smsCodeResult.getMsg())); throw new RenException(smsCodeResult.getCode()); } //4、保存短信验证码(删除现有短信验证码、将新的短信验证码存入Redis) - captchaRedis.saveSmsCode(formDTO, smsCodeResult.getData().get("code"));*/ + captchaRedis.saveSmsCode(formDTO, smsCodeResult.getData().getCode()); logger.info(String.format("发送短信验证码成功,手机号[%s]", formDTO.getMobile())); } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java new file mode 100644 index 0000000000..3bfac0e8f7 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java @@ -0,0 +1,30 @@ +package com.epmet.constant; + +/** + * 短信模板编码常亮 + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/23 21:30 + */ +public interface SmsTemplateConstant { + + /** + * 登录确认验证码 + */ + String LGOIN_CONFIRM="SMS_150731396"; + + /** + * 用户注册验证码 + */ + String USER_REGISTER="SMS_150731394"; + + /** + * 信息变更验证码 + */ + String CHANGE_INFO="SMS_150731392"; + + /** + * 修改密码验证码 + */ + String CHANGE_PASSWORD = "SMS_150731393"; +} diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java index 91eff10e8b..d698373e9f 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java @@ -54,5 +54,8 @@ public class SysSmsDTO implements Serializable { @ApiModelProperty(value = "参数列表") private String params; - + /** + * 短信模板编码 来源于SmsTemplateConstant + */ + private String aliyunTemplateCode; } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendVerificationCodeFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendVerificationCodeFormDTO.java new file mode 100644 index 0000000000..97aaa8549b --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendVerificationCodeFormDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 根据手机号、短信模板编码，发送短信 验证码 + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/23 20:58 + */ +@Data +public class SendVerificationCodeFormDTO implements Serializable { + private static final long serialVersionUID = 8894395590639206399L; + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 手机号 + */ + @NotBlank(message = "手机号不能为空", groups = {AddUserInternalGroup.class, AddUserShowGroup.class}) + private String mobile; + + /** + * 场景： + */ + @NotBlank(message = "短信模板编码不能为空", groups = {AddUserInternalGroup.class}) + private String aliyunTemplateCode; +} diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/SendVerificationCodeResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/SendVerificationCodeResultDTO.java new file mode 100644 index 0000000000..2442da7cb1 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/SendVerificationCodeResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 短信验证码 + * + * @author yinzuomei@elink-cn.com + * @date 2020/6/23 21:37 + */ +@Data +public class SendVerificationCodeResultDTO implements Serializable { + /** + * 短信验证码 + */ + private String code; +} diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java index ba775e2546..9d0a60fbf1 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java @@ -1,5 +1,12 @@ package com.epmet.feign; +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.SysSmsDTO; +import com.epmet.dto.form.SendVerificationCodeFormDTO; +import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.dto.result.SendVerificationCodeResultDTO; +import com.epmet.feign.fallback.EpmetMessageOpenFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; @@ -7,12 +14,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.SysSmsDTO; -import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.feign.fallback.EpmetMessageOpenFeignClientFallback; - /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 * @@ -44,4 +45,14 @@ public interface EpmetMessageOpenFeignClient { **/ @PostMapping(value = "message/usermessage/saveusermessage", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result saveUserMessage(@RequestBody UserMessageFormDTO formDto); + + /** + * @param + * @return com.epmet.commons.tools.utils.Result + * @author yinzuomei + * @description 发送短信验证码（区分场景） + * @Date 2020/6/23 20:56 + **/ + @PostMapping(value = "message/sms/sendVerificationCode", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result sendVerificationCode(@RequestBody SendVerificationCodeFormDTO formDTO); } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java index a3f4dbbbc1..6bd8c16bb8 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java @@ -1,13 +1,14 @@ package com.epmet.feign.fallback; -import org.springframework.stereotype.Component; - import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.SysSmsDTO; +import com.epmet.dto.form.SendVerificationCodeFormDTO; import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; +import org.springframework.stereotype.Component; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -32,4 +33,10 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig public Result saveUserMessage(UserMessageFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessage", formDto); } + + @Override + public Result sendVerificationCode(SendVerificationCodeFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendVerificationCode", formDTO); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java index 008429520d..0a0f534a0a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java @@ -9,7 +9,6 @@ package com.epmet.controller; import com.alibaba.fastjson.JSON; -import com.epmet.commons.tools.annotation.LogOperation; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; @@ -17,6 +16,8 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AliyunGroup; import com.epmet.commons.tools.validator.group.QcloudGroup; import com.epmet.dto.SysSmsDTO; +import com.epmet.dto.form.SendVerificationCodeFormDTO; +import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.enums.PlatformEnum; import com.epmet.remote.ParamsRemoteService; import com.epmet.service.SysSmsService; @@ -31,7 +32,6 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import java.util.Arrays; -import java.util.HashMap; import java.util.Map; /** @@ -76,7 +76,6 @@ public class SmsController { @PostMapping("saveConfig") @ApiOperation("保存配置短信") -// @LogOperation("保存配置短信") public Result saveConfig(@RequestBody SmsConfig config){ //校验类型 ValidatorUtils.validateEntity(config); @@ -96,19 +95,17 @@ public class SmsController { @PostMapping("send") @ApiOperation("发送短信") -// @LogOperation("发送短信") @ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机好号", paramType = "query", required = true, dataType="String"), @ApiImplicitParam(name = "params", value = "参数", paramType = "query", required = true, dataType="String") }) public Result send(@RequestBody SysSmsDTO sysSmsDTO){ - sysSmsService.send(sysSmsDTO.getMobile(), sysSmsDTO.getParams()); + sysSmsService.send(sysSmsDTO); return new Result(); } @DeleteMapping @ApiOperation("删除") -// @LogOperation("删除") public Result delete(@RequestBody Long[] ids){ sysSmsService.deleteBatchIds(Arrays.asList(ids)); @@ -121,7 +118,6 @@ public class SmsController { */ @GetMapping("captcha/{mobile}") @ApiOperation("发送短信验证码") - //@LogOperation("发送短信验证码") @ApiImplicitParams({ @ApiImplicitParam(name = "mobile", value = "手机号", paramType = "query", required = true, dataType="String") }) @@ -129,4 +125,18 @@ public class SmsController { Result result = sysSmsService.sendSmsCaptcha(mobile); return result; } + + /** + * @return com.epmet.commons.tools.utils.Result + * @param formDTO + * @author yinzuomei + * @description 发送短信验证码（区分场景） + * @Date 2020/6/23 21:05 + **/ + @PostMapping("sendVerificationCode") + public Result sendVerificationCode(@RequestBody SendVerificationCodeFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,SendVerificationCodeFormDTO.AddUserShowGroup.class,SendVerificationCodeFormDTO.AddUserInternalGroup.class); + SendVerificationCodeResultDTO resultDTO=sysSmsService.sendVerificationCode(formDTO); + return new Result().ok(resultDTO); + } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java index 79c7cddd1c..1e67125423 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java @@ -12,6 +12,8 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.SysSmsDTO; +import com.epmet.dto.form.SendVerificationCodeFormDTO; +import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.entity.SysSmsEntity; import java.util.LinkedHashMap; @@ -28,10 +30,9 @@ public interface SysSmsService extends BaseService { /** * 发送短信 - * @param mobile 手机号 - * @param params 短信参数 + * @param sysSmsDTO :mobile 手机号 params短信参数 aliyunTemplateCode:短信模板 */ - void send(String mobile, String params); + void send(SysSmsDTO sysSmsDTO); /** * 保存短信发送记录 @@ -48,5 +49,14 @@ public interface SysSmsService extends BaseService { * @return */ Result sendSmsCaptcha(String mobile); + + /** + * @return java.util.HashMap + * @param formDTO + * @author yinzuomei + * @description 发送短信验证码（区分场景） + * @Date 2020/6/23 21:07 + **/ + SendVerificationCodeResultDTO sendVerificationCode(SendVerificationCodeFormDTO formDTO); } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java index 9dc94b7a2d..2f8600641e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java @@ -20,6 +20,8 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.SysSmsDao; import com.epmet.dto.SysSmsDTO; +import com.epmet.dto.form.SendVerificationCodeFormDTO; +import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.entity.SysSmsEntity; import com.epmet.exception.ModuleErrorCode; import com.epmet.feign.EpmetMessageOpenFeignClient; @@ -67,10 +69,10 @@ public class SysSmsServiceImpl extends BaseServiceImpl } @Override - public void send(String mobile, String params) { + public void send(SysSmsDTO sysSmsDTO) { LinkedHashMap map; try { - map = JSON.parseObject(params, LinkedHashMap.class); + map = JSON.parseObject(sysSmsDTO.getParams(), LinkedHashMap.class); }catch (Exception e){ throw new RenException(ErrorCode.JSON_FORMAT_ERROR); } @@ -80,9 +82,12 @@ public class SysSmsServiceImpl extends BaseServiceImpl if(service == null){ throw new RenException(ModuleErrorCode.SMS_CONFIG); } - //发送短信 - service.sendSms(mobile, map); + if(StringUtils.isNotBlank(sysSmsDTO.getAliyunTemplateCode())){ + service.sendSmsByAliyunTemplateCode(sysSmsDTO.getMobile(), map,sysSmsDTO.getAliyunTemplateCode()); + }else{ + service.sendSms(sysSmsDTO.getMobile(), map); + } } @Override @@ -141,4 +146,34 @@ public class SysSmsServiceImpl extends BaseServiceImpl } return new Result().error(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode()); } + + @Override + public SendVerificationCodeResultDTO sendVerificationCode(SendVerificationCodeFormDTO formDTO) { + SendVerificationCodeResultDTO data = new SendVerificationCodeResultDTO(); + Integer code = (int) ((Math.random() * 9 + 1) * 100000); + String codeStr = String.valueOf(code); + HashMap map = new HashMap<>(); + map.put("code", codeStr); + + try { + String paramJson = new ObjectMapper().writeValueAsString(map); + + SysSmsDTO sysSmsDTO = new SysSmsDTO(); + sysSmsDTO.setMobile(formDTO.getMobile()); + sysSmsDTO.setParams(paramJson); + sysSmsDTO.setAliyunTemplateCode(formDTO.getAliyunTemplateCode()); + Result result = epmetMessageOpenFeignClient.send(sysSmsDTO); + if (result != null && result.success()) { + data.setCode(codeStr); + } else { + logger.error(String.format("短信验证码发送失败,手机号:%s。code:%d,msg:%s", formDTO.getMobile(), result.getCode(), result.getMsg())); + throw new RenException(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode()); + } + } catch (Exception e) { + e.printStackTrace(); + logger.error(String.format("短信验证码发送失败,手机号:%s。errorMessage:%s", formDTO.getMobile(), e.getMessage())); + throw new RenException(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode()); + } + return data; + } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/AbstractSmsService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/AbstractSmsService.java index a29130457b..e1a07530fb 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/AbstractSmsService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/AbstractSmsService.java @@ -37,4 +37,17 @@ public abstract class AbstractSmsService { * @param template 短信模板 */ public abstract void sendSms(String mobile, LinkedHashMap params, String signName, String template); + + /** + * @return void + * @param mobile 手机号 + * @param params 参数 + * @param aliyunTemplateCode 短息模板编码 + * @author yinzuomei + * @description + * @Date 2020/6/23 21:27 + **/ + public abstract void sendSmsByAliyunTemplateCode(String mobile, + LinkedHashMap params, + String aliyunTemplateCode); } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/AliyunSmsService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/AliyunSmsService.java index 7c97eb11ad..9ec5c16cd5 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/AliyunSmsService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/AliyunSmsService.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.enums.PlatformEnum; import com.epmet.exception.ModuleErrorCode; import com.epmet.service.SysSmsService; +import org.apache.commons.lang3.StringUtils; import java.util.LinkedHashMap; @@ -108,4 +109,13 @@ public class AliyunSmsService extends AbstractSmsService { throw new RenException(ModuleErrorCode.SEND_SMS_ERROR, response.getMessage()); } } + + @Override + public void sendSmsByAliyunTemplateCode(String mobile, LinkedHashMap params,String aliyunTemplateCode) { + if(StringUtils.isNotBlank(aliyunTemplateCode)){ + this.sendSms(mobile, params, config.getAliyunSignName(), aliyunTemplateCode); + return; + } + this.sendSms(mobile, params, config.getAliyunSignName(), config.getAliyunTemplateCode()); + } } From 0bf3fe3a04fd60144a1cbf13441e023efe952789 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 21:50:56 +0800 Subject: [PATCH 26/34] =?UTF-8?q?auth=E3=80=81message:=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E7=AB=AF=E7=99=BB=E5=BD=95=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9;resi-partymember=E6=94=AF?= =?UTF-8?q?=E9=83=A8=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- .../epmet-message-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index a63457b568..bbc475fc6f 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.21 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.22 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 51b2074663..fd3c252986 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.21 + 0.3.22 com.epmet epmet-cloud diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index 5b43fe23c5..247bcb1da8 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.19 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.20 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 481ab4f529..af934e124c 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.19 + 0.3.20 com.epmet epmet-message diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 1574e7f53e..9aa9529d34 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.51 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.52 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index c50af5590b..58cfd05402 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.51 + 0.3.52 com.epmet resi-partymember From 25a45ac94f880a7fa57115378e4b08870e6e6088 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 22:01:10 +0800 Subject: [PATCH 27/34] =?UTF-8?q?message=E5=8D=87=E7=BA=A7=EF=BC=9Aadd?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=89=8B=E6=9C=BA=E5=8F=B7=E3=80=81=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E7=BC=96=E7=A0=81=E5=8F=91=E9=80=81=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-message-server/deploy/docker-compose-dev.yml | 2 +- .../epmet-message/epmet-message-server/pom.xml | 2 +- .../src/main/java/com/epmet/sms/QcloudSmsService.java | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index 247bcb1da8..adc35709b2 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.20 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.21 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index af934e124c..01a6bc6f5f 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.20 + 0.3.21 com.epmet epmet-message diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java index 7c16e641dd..a3e33d6557 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/sms/QcloudSmsService.java @@ -17,6 +17,7 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.enums.PlatformEnum; import com.epmet.exception.ModuleErrorCode; import com.epmet.service.SysSmsService; +import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -67,4 +68,13 @@ public class QcloudSmsService extends AbstractSmsService { throw new RenException(ModuleErrorCode.SEND_SMS_ERROR, result.errMsg); } } + + @Override + public void sendSmsByAliyunTemplateCode(String mobile, LinkedHashMap params,String aliyunTemplateCode) { + if(StringUtils.isNotBlank(aliyunTemplateCode)){ + this.sendSms(mobile, params, config.getAliyunSignName(), aliyunTemplateCode); + return; + } + this.sendSms(mobile, params, config.getAliyunSignName(), config.getAliyunTemplateCode()); + } } From 88639cbfc0baf8bb5cdb188ff65cc3bca344e30b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 22:53:52 +0800 Subject: [PATCH 28/34] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GovLoginServiceImpl.java | 3 +-- .../impl/PartyMemberConfirmServiceImpl.java | 6 ++--- .../service/impl/UserResiInfoServiceImpl.java | 27 +++++++++---------- 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java index 45e34e282e..7e11ab328e 100644 --- a/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java +++ b/epmet-auth/src/main/java/com/epmet/service/impl/GovLoginServiceImpl.java @@ -115,8 +115,7 @@ public class GovLoginServiceImpl implements GovLoginService { String rightSmsCode = captchaRedis.getSmsCode(formDTO.getMobile()); if (!formDTO.getSmsCode().equals(rightSmsCode)) { logger.error(String.format("验证码错误code[%s],msg[%s]",EpmetErrorCode.MOBILE_CODE_ERROR.getCode(),EpmetErrorCode.MOBILE_CODE_ERROR.getMsg())); - //TODO 2020-05-21 校验验证码先去掉方便测试 - //throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); + throw new RenException(EpmetErrorCode.MOBILE_CODE_ERROR.getCode()); } //3、查询用户所有的组织信息 List customerIdList = new ArrayList<>(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index a51cc29d90..a06d5b460b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -57,6 +57,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; /** * 党员认证 @@ -150,8 +151,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService if (null != partyMemberInfoResult) { return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode()); } - //TODO 方便测试屏蔽短信验证码 - /*//生成短信验证码 + //生成短信验证码 Map message = (Map) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData(); if (null == message) { return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); @@ -160,7 +160,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService partyMemberInfoRedis.deleteUserMobileCodeByPattern(fromDTO.getUserId(), fromDTO.getMobile()); //将验证码存入Redis - partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), message.get("code"));*/ + partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), message.get("code")); //将访问记录更新到热心居民申请行为记录表 saveOrUpdateVisit(fromDTO.getVisitId(), null, PartyMemberConstant.OPERATE_OPERATE_SMS_CODE); 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 d831b34e14..5901ddd950 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 @@ -26,19 +26,18 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.SmsTemplateConstant; import com.epmet.constant.UserConstant; import com.epmet.constant.UserRoleConstant; import com.epmet.dao.UserResiInfoDao; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; -import com.epmet.dto.form.IssueInitiatorFormDTO; -import com.epmet.dto.form.UserResiInfoFormDTO; -import com.epmet.dto.form.UserResiInfoListFormDTO; -import com.epmet.dto.form.VerificationCodeFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.IssueInitiatorResultDTO; +import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.entity.UserResiInfoEntity; -import com.epmet.feign.MessageFeignClient; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.redis.UserResiInfoRedis; import com.epmet.service.RegisterRelationService; import com.epmet.service.UserResiInfoService; @@ -77,7 +76,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl page(Map params) { @@ -202,25 +201,25 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl map = (Map) result.getData(); - if (null == map || null == map.get("code")) { + //3:调用短信服务 生成验证码发送短信 + SendVerificationCodeFormDTO sendVerificationCodeFormDTO=new SendVerificationCodeFormDTO(); + sendVerificationCodeFormDTO.setMobile(verificationCodeFormDTO.getMobile()); + sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.USER_REGISTER); + Result result = epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO); + if(!result.success()||null==result.getData()||StringUtils.isBlank(result.getData().getCode())){ return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); } //4:删除缓存中可能存在的旧验证码 userResiInfoRedis.deleteOldUserMobileCode(verificationCodeFormDTO.getUserId(), verificationCodeFormDTO.getMobile()); //5:将验证码存入redis - userResiInfoRedis.setUserResiMobileCode(verificationCodeFormDTO.getUserId(),verificationCodeFormDTO.getMobile(),map.get("code").toString());*/ - return result; + userResiInfoRedis.setUserResiMobileCode(verificationCodeFormDTO.getUserId(),verificationCodeFormDTO.getMobile(),result.getData().getCode()); + return new Result(); } @Override From 8bf5c0e9dad9baa6d8c52cfe98f54aa6373d84bf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 23:43:05 +0800 Subject: [PATCH 29/34] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=85=9A=E5=91=98?= =?UTF-8?q?=E3=80=81=E6=B3=A8=E5=86=8C=E5=B1=85=E6=B0=91=E3=80=81=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=AB=AF=E7=99=BB=E5=BD=95=EF=BC=8C=E9=AA=8C=E8=AF=81?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9v1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/EpmetMessageOpenFeignClient.java | 11 +++++++ .../EpmetMessageOpenFeignClientFallback.java | 6 ++++ .../impl/PartyMemberConfirmServiceImpl.java | 32 +++++++++---------- epmet-user/epmet-user-server/pom.xml | 6 ++++ 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java index 9d0a60fbf1..76ac6ca878 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java @@ -14,6 +14,8 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import java.util.List; + /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 * @@ -55,4 +57,13 @@ public interface EpmetMessageOpenFeignClient { **/ @PostMapping(value = "message/sms/sendVerificationCode", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result sendVerificationCode(@RequestBody SendVerificationCodeFormDTO formDTO); + + /** + * @param msgList + * @return com.epmet.commons.tools.utils.Result + * @Author sun + * @Description 热心居民申请给网格长们发送消息 + **/ + @PostMapping(value = "message/usermessage/saveusermessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result saveUserMessageList(List msgList); } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java index 6bd8c16bb8..3cc5a5c5eb 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java @@ -10,6 +10,8 @@ import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import org.springframework.stereotype.Component; +import java.util.List; + /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 * @@ -39,4 +41,8 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendVerificationCode", formDTO); } + @Override + public Result saveUserMessageList(List msgList) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveUserMessageList", msgList); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index a06d5b460b..61d8f0a5f4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -10,19 +10,14 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.constant.PartyMemberConstant; import com.epmet.constant.PartyMemberMessageConstant; import com.epmet.constant.ReadFlagConstant; +import com.epmet.constant.SmsTemplateConstant; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.CustomerStaffGridDTO; import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserRoleDTO; -import com.epmet.dto.form.CustomerGridFormDTO; -import com.epmet.dto.form.StaffRoleFormDTO; -import com.epmet.dto.form.UserMessageFormDTO; -import com.epmet.dto.form.UserResiInfoFormDTO; -import com.epmet.dto.result.AgencyAndStaffsResultDTO; -import com.epmet.dto.result.GovStaffRoleResultDTO; -import com.epmet.dto.result.GridInfoResultDTO; -import com.epmet.dto.result.UserResiInfoResultDTO; -import com.epmet.modules.feign.EpmetMessageFeignClient; +import com.epmet.dto.form.*; +import com.epmet.dto.result.*; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.feign.ResiGroupFeignClient; @@ -48,6 +43,7 @@ import com.epmet.resi.partymember.dto.partymember.result.AuditingDetailResultDTO import com.epmet.resi.partymember.dto.partymember.result.AutoFailedDetailResultDTO; import com.epmet.resi.partymember.dto.partymember.result.RejectedDetailResultDTO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -57,7 +53,6 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; -import java.util.Map; /** * 党员认证 @@ -86,7 +81,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService @Autowired private PartymemberRegisterRelationService partymemberRegisterRelationService; @Autowired - private EpmetMessageFeignClient messageFeignClient; + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @Autowired private GovOrgFeignClient govOrgFeignClient; @Autowired @@ -152,15 +147,20 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode()); } //生成短信验证码 - Map message = (Map) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData(); - if (null == message) { + SendVerificationCodeFormDTO sendVerificationCodeFormDTO=new SendVerificationCodeFormDTO(); + sendVerificationCodeFormDTO.setMobile(fromDTO.getMobile()); + sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.USER_REGISTER); + Result sendVerificationCodeResult = epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO); + if(!sendVerificationCodeResult.success()|| + null==sendVerificationCodeResult.getData() + || StringUtils.isBlank(sendVerificationCodeResult.getData().getCode())){ return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); } //删除旧验证码 partyMemberInfoRedis.deleteUserMobileCodeByPattern(fromDTO.getUserId(), fromDTO.getMobile()); //将验证码存入Redis - partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), message.get("code")); + partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), sendVerificationCodeResult.getData().getCode()); //将访问记录更新到热心居民申请行为记录表 saveOrUpdateVisit(fromDTO.getVisitId(), null, PartyMemberConstant.OPERATE_OPERATE_SMS_CODE); @@ -618,7 +618,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService userMessageFormDTO.setMessageContent(messageContent); userMessageFormDTO.setReadFlag(ReadFlagConstant.UN_READ); //保存消息 - return messageFeignClient.saveUserMessage(userMessageFormDTO); + return epmetMessageOpenFeignClient.saveUserMessage(userMessageFormDTO); } /** @@ -673,7 +673,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService }); }); if (msgList.size() > NumConstant.ZERO) { - result = messageFeignClient.saveUserMessageList(msgList); + result = epmetMessageOpenFeignClient.saveUserMessageList(msgList); } return result; } diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 7da3cceed3..05a73042f7 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -82,6 +82,12 @@ 2.0.0 compile + + com.epmet + epmet-message-client + 2.0.0 + compile + From 16d40c73adf8d506585ee3e9578032a28f14b694 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 23:46:34 +0800 Subject: [PATCH 30/34] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=8F=91=E5=B8=83130=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-dev.yml | 2 +- epmet-auth/pom.xml | 2 +- .../epmet-message-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/epmet-message/epmet-message-server/pom.xml | 2 +- .../resi-partymember-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/resi-partymember/resi-partymember-server/pom.xml | 2 +- epmet-user/epmet-user-server/deploy/docker-compose-dev.yml | 2 +- epmet-user/epmet-user-server/pom.xml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-dev.yml b/epmet-auth/deploy/docker-compose-dev.yml index bbc475fc6f..e76069a10f 100644 --- a/epmet-auth/deploy/docker-compose-dev.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.22 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.23 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index fd3c252986..25c493667a 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.22 + 0.3.23 com.epmet epmet-cloud diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml index adc35709b2..c5e1c7579d 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.21 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-message-server:0.3.22 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index 01a6bc6f5f..cf6938d147 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.21 + 0.3.22 com.epmet epmet-message diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 9aa9529d34..b59f1fb9b1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.52 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.53 ports: - "8096:8096" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 58cfd05402..383b4a14fe 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.52 + 0.3.53 com.epmet resi-partymember diff --git a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 1b546e9355..4ed23e2498 100644 --- a/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.60 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.61 ports: - "8087:8087" network_mode: host # 不会创建新的网络 diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index 05a73042f7..153d33f2e2 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.60 + 0.3.61 com.epmet epmet-user From 091842a56c64ef39a19a606e4cad3966c2b053f8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Jun 2020 00:26:15 +0800 Subject: [PATCH 31/34] =?UTF-8?q?=E6=97=A5=E5=BF=97=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/logback-spring.xml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml index 347c3c808c..be99941c33 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml @@ -137,8 +137,12 @@ - - + + + + + + @@ -151,7 +155,12 @@ - + + + + + + From 6e73722d18b6f695765183cb6884817db2983738 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 24 Jun 2020 09:06:59 +0800 Subject: [PATCH 32/34] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-report-server/src/main/resources/logback-spring.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml index be99941c33..ad10364cb5 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml @@ -143,6 +143,7 @@ + @@ -161,6 +162,7 @@ + From 57bb9278f23d5d42681d92ec8f6f4773e6b92642 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 24 Jun 2020 09:17:34 +0800 Subject: [PATCH 33/34] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/issue/IssueDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml index 19e81a0cb5..bb9e3b4747 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/issue/IssueDao.xml @@ -35,6 +35,7 @@ WHERE fiad.DEL_FLAG = '0' AND fiad.PID = #{agencyId} GROUP BY AGENCY_ID + ORDER BY fiad.ISSUE_TOTAL DESC