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/FactArticlePublishedAgencyDailyDTO.java
new file mode 100644
index 0000000000..8aa0274eab
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedAgencyDailyDTO.java
@@ -0,0 +1,121 @@
+/**
+ * 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 FactArticlePublishedAgencyDailyDTO 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;
+
+ /**
+ * 日期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/FactArticlePublishedDepartmentDailyDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java
new file mode 100644
index 0000000000..63dcdf8194
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedDepartmentDailyDTO.java
@@ -0,0 +1,121 @@
+/**
+ * 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
new file mode 100644
index 0000000000..ef9441018c
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactArticlePublishedGridDailyDTO.java
@@ -0,0 +1,121 @@
+/**
+ * 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-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
new file mode 100644
index 0000000000..f9bb58d4ed
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyDailyDTO.java
@@ -0,0 +1,126 @@
+/**
+ * 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
new file mode 100644
index 0000000000..9e66642afb
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyMonthlyDTO.java
@@ -0,0 +1,106 @@
+/**
+ * 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
new file mode 100644
index 0000000000..b5e845f6f8
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyQuarterlyDTO.java
@@ -0,0 +1,106 @@
+/**
+ * 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
new file mode 100644
index 0000000000..9f420f6b37
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedAgencyYearlyDTO.java
@@ -0,0 +1,106 @@
+/**
+ * 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
new file mode 100644
index 0000000000..d34da43745
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridDailyDTO.java
@@ -0,0 +1,126 @@
+/**
+ * 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
new file mode 100644
index 0000000000..a1c6e3209d
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridMonthlyDTO.java
@@ -0,0 +1,106 @@
+/**
+ * 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
new file mode 100644
index 0000000000..10b049d10f
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridQuarterlyDTO.java
@@ -0,0 +1,106 @@
+/**
+ * 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
new file mode 100644
index 0000000000..2864b508de
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/publicity/dto/result/FactTagViewedGridYearlyDTO.java
@@ -0,0 +1,106 @@
+/**
+ * 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-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
index 51bece6d52..c8c1848738 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
@@ -24,7 +24,7 @@ import java.util.List;
* @author yinzuomei@elink-cn.com
* @date 2020/6/4 13:09
*/
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class,url="localhost:8087")
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserOpenFeignClientFallback.class)
public interface EpmetUserOpenFeignClient {
/**