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

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/group/result/DimTimeResultDTO.java

@@ -1,11 +1,14 @@
 package com.epmet.dto.group.result;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
  * @Author zxc
  * @CreateTime 2020/6/17 19:16
  */
+@Data
 public class DimTimeResultDTO implements Serializable {
 
     private static final long serialVersionUID = -2863598069938303232L;

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactArticlePublishedAgencyDailyDTO.java

@@ -0,0 +1,122 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章发布数量【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactArticlePublishedDepartmentDailyDTO.java

@@ -0,0 +1,122 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章发布数量【部门】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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 depsartmentId;
+
+    /**
+     * 文章累计发文数量 文章数量
+     */
+	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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactArticlePublishedGridDailyDTO.java

@@ -0,0 +1,122 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章发布数量【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedAgencyDailyDTO.java

@@ -0,0 +1,127 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedAgencyDailyDTO 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 usedCount;
+
+    /**
+     * 日期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：2020-06 = 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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedAgencyMonthlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【机关】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedAgencyMonthlyDTO 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 usedCount;
+
+    /**
+     * 月份ID 月份ID   eg：202006 = 2020年6月、202007 = 2020年7月
+     */
+	private String monthId;
+
+    /**
+     * 删除状态
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedAgencyQuarterlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【机关】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedAgencyQuarterlyDTO 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 usedCount;
+
+    /**
+     * 季度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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedAgencyYearlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【机关】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedAgencyYearlyDTO 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 usedCount;
+
+    /**
+     * 年度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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedDepartmentDailyDTO.java

@@ -0,0 +1,132 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【部门】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedDepartmentDailyDTO 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
+     */
+	private String departmentId;
+
+    /**
+     * 标签ID 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 标签使用次数 标签的使用次数
+     */
+	private Integer usedCount;
+
+    /**
+     * 日期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月、202007 = 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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedDepartmentMonthlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【部门】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedDepartmentMonthlyDTO 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;
+
+    /**
+     * 标签ID 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 标签使用次数 标签的使用次数
+     */
+	private Integer usedCount;
+
+    /**
+     * 月份ID 月份ID   eg：202006 = 2020年6月、202007 = 2020年7月
+     */
+	private String monthId;
+
+    /**
+     * 删除状态
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedDepartmentQuarterlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【部门】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedDepartmentQuarterlyDTO 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;
+
+    /**
+     * 标签ID 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 标签使用次数 标签的使用次数
+     */
+	private Integer usedCount;
+
+    /**
+     * 季度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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedDepartmentYearlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【部门】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedDepartmentYearlyDTO 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;
+
+    /**
+     * 标签ID 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 标签使用次数 标签的使用次数
+     */
+	private Integer usedCount;
+
+    /**
+     * 年度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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedGridDailyDTO.java

@@ -0,0 +1,127 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedGridDailyDTO 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 usedCount;
+
+    /**
+     * 日期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月、202007 = 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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedGridMonthlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【网格】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedGridMonthlyDTO 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 usedCount;
+
+    /**
+     * 月份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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedGridQuarterlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【网格】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedGridQuarterlyDTO 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 usedCount;
+
+    /**
+     * 季度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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagUsedGridYearlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 标签【网格】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+public class FactTagUsedGridYearlyDTO 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 usedCount;
+
+    /**
+     * 年度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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagViewedAgencyDailyDTO.java

@@ -0,0 +1,127 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章引用标签阅读数量【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagViewedAgencyMonthlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章引用标签阅读数量【机关】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagViewedAgencyQuarterlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章引用标签阅读数量【机关】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagViewedAgencyYearlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章引用标签阅读数量【机关】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagViewedGridDailyDTO.java

@@ -0,0 +1,127 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章引用标签阅读数量【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagViewedGridMonthlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章引用标签阅读数量【网格】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagViewedGridQuarterlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章引用标签阅读数量【网格】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/stats/FactTagViewedGridYearlyDTO.java

@@ -0,0 +1,107 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.stats;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 文章引用标签阅读数量【网格】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java

@@ -0,0 +1,34 @@
+package com.epmet.constant;
+
+/**
+ * @author sun
+ * @dscription 数据-项目-常量
+ */
+public interface ProjectConstant {
+
+    /**
+     * 状态-待处理
+     */
+    String PENDING = "pending";
+    /**
+     * 状态-结案
+     */
+    String CLOSED = "closed";
+    /**
+     * 结案状态-已解决
+     */
+    String RESOLVED = "resolved";
+    /**
+     * 结案状态-未解决
+     */
+    String UNRESOLVED = "unresolved";
+    /**
+     * 项目处理进展-创建项目
+     */
+    String CREATED = "created";
+    /**
+     * 项目处理进展-结案
+     */
+    String CLOSE = "close";
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/StatsProjectController.java

@@ -29,4 +29,16 @@ public class StatsProjectController {
         return new Result();
     }
 
+    /**
+     * @param customerId
+     * @return
+     * @Author sun
+     * @Description 数据-项目-网格日(月)统计
+     **/
+    @PostMapping("gridproject/{customerId}")
+    public Result statsGridProject(@PathVariable("customerId") String customerId) {
+        statsProjectService.statsGridProject(customerId);
+        return new Result();
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectDao.java

@@ -20,6 +20,9 @@ package com.epmet.dao.project;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.project.ProjectEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 项目表
@@ -30,4 +33,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ProjectDao extends BaseDao<ProjectEntity> {
 
+    /**
+     * @param customerId
+     * @Author sun
+     * @Description 根据客户Id查询客户项目业务表有效数据
+     **/
+    List<ProjectEntity> selectProjectList(@Param("customerId") String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java

@@ -0,0 +1,43 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.project;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.project.ProjectProcessEntity;
+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-05-11
+ */
+@Mapper
+public interface ProjectProcessDao extends BaseDao<ProjectProcessEntity> {
+
+    /**
+     * @param customerId
+     * @Author sun
+     * @Description 查询客户项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy-mm-dd格式字段值)
+     **/
+    List<ProjectProcessEntity> selectProcessList(@Param("customerId") String customerId);
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimCustomerDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao.stats;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.stats.DimCustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -35,12 +36,11 @@ public interface DimCustomerDao extends BaseDao<DimCustomerEntity> {
 	/**
 	 * desc:  分页获取客户id
 	 *
-	 * @param pageNo
-	 * @param offset
-	 * return: List<String>
+	 * @param pageSize
+	 * @param offset return: List<String>
 	 * @date: 2020/6/17 16:33
 	 * @author: jianjun liu
 	 * email:liujianjun@git.elinkit.com.cn
 	 */
-	List<String> selectCustomerIdPage(Integer pageNo, int offset);
+	List<String> selectCustomerIdPage(@Param("offset") Integer offset, @Param("pageSize") Integer pageSize);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/DimGridDao.java

@@ -18,13 +18,10 @@
 package com.epmet.dao.stats;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.entity.org.CustomerGridEntity;
 import com.epmet.dto.group.result.CustomerGridInfoResultDTO;
 import com.epmet.entity.stats.DimGridEntity;
 import org.apache.ibatis.annotations.Mapper;
-
-import java.util.Date;
-import java.util.List;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -37,9 +34,15 @@ import java.util.List;
 @Mapper
 public interface DimGridDao extends BaseDao<DimGridEntity> {
 
-    DimGridEntity getLastCreatedGridDimEntity();
+	DimGridEntity getLastCreatedGridDimEntity();
 
 
-    List<CustomerGridInfoResultDTO> selectCustomerGrid();
+	List<CustomerGridInfoResultDTO> selectCustomerGrid();
 
+	/**
+	 * desc:根据客户Id获取 该客户下的网格数据
+	 * @param customerId
+	 * @return
+	 */
+	List<DimGridEntity> getGridListByCustomerId(@Param("customerId") String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedAgencyDailyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章发布数量【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactArticlePublishedAgencyDailyDao extends BaseDao<FactArticlePublishedAgencyDailyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedDepartmentDailyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactArticlePublishedDepartmentDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章发布数量【部门】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactArticlePublishedDepartmentDailyDao extends BaseDao<FactArticlePublishedDepartmentDailyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactArticlePublishedGridDailyDao.java

@@ -0,0 +1,45 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
+import com.epmet.entity.stats.FactArticlePublishedGridDailyEntity;
+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-18
+ */
+@Mapper
+public interface FactArticlePublishedGridDailyDao extends BaseDao<FactArticlePublishedGridDailyEntity> {
+
+	/**
+	 * desc:获取客户 指定日期内的数据
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return
+	 */
+	List<FactArticlePublishedAgencyDailyEntity> getByBeforeDay(@Param("customerId") String customerId, @Param("dateId") String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedAgencyDailyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedAgencyDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedAgencyDailyDao extends BaseDao<FactTagUsedAgencyDailyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedAgencyMonthlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedAgencyMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【机关】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedAgencyMonthlyDao extends BaseDao<FactTagUsedAgencyMonthlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedAgencyQuarterlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedAgencyQuarterlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【机关】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedAgencyQuarterlyDao extends BaseDao<FactTagUsedAgencyQuarterlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedAgencyYearlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedAgencyYearlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【机关】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedAgencyYearlyDao extends BaseDao<FactTagUsedAgencyYearlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedDepartmentDailyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedDepartmentDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【部门】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedDepartmentDailyDao extends BaseDao<FactTagUsedDepartmentDailyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedDepartmentMonthlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedDepartmentMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【部门】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedDepartmentMonthlyDao extends BaseDao<FactTagUsedDepartmentMonthlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedDepartmentQuarterlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedDepartmentQuarterlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【部门】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedDepartmentQuarterlyDao extends BaseDao<FactTagUsedDepartmentQuarterlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedDepartmentYearlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedDepartmentYearlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【部门】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedDepartmentYearlyDao extends BaseDao<FactTagUsedDepartmentYearlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedGridDailyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedGridDailyDao extends BaseDao<FactTagUsedGridDailyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedGridMonthlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【网格】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedGridMonthlyDao extends BaseDao<FactTagUsedGridMonthlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedGridQuarterlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedGridQuarterlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【网格】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedGridQuarterlyDao extends BaseDao<FactTagUsedGridQuarterlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagUsedGridYearlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagUsedGridYearlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 标签【网格】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagUsedGridYearlyDao extends BaseDao<FactTagUsedGridYearlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagViewedAgencyDailyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagViewedAgencyDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章引用标签阅读数量【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagViewedAgencyDailyDao extends BaseDao<FactTagViewedAgencyDailyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagViewedAgencyMonthlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagViewedAgencyMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章引用标签阅读数量【机关】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagViewedAgencyMonthlyDao extends BaseDao<FactTagViewedAgencyMonthlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagViewedAgencyQuarterlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagViewedAgencyQuarterlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章引用标签阅读数量【机关】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagViewedAgencyQuarterlyDao extends BaseDao<FactTagViewedAgencyQuarterlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagViewedAgencyYearlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagViewedAgencyYearlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章引用标签阅读数量【机关】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagViewedAgencyYearlyDao extends BaseDao<FactTagViewedAgencyYearlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagViewedGridDailyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagViewedGridDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章引用标签阅读数量【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagViewedGridDailyDao extends BaseDao<FactTagViewedGridDailyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagViewedGridMonthlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagViewedGridMonthlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章引用标签阅读数量【网格】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagViewedGridMonthlyDao extends BaseDao<FactTagViewedGridMonthlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagViewedGridQuarterlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagViewedGridQuarterlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章引用标签阅读数量【网格】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagViewedGridQuarterlyDao extends BaseDao<FactTagViewedGridQuarterlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/FactTagViewedGridYearlyDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dao.stats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.stats.FactTagViewedGridYearlyEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 文章引用标签阅读数量【网格】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Mapper
+public interface FactTagViewedGridYearlyDao extends BaseDao<FactTagViewedGridYearlyEntity> {
+	
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/voice/ArticlePublishRangeDao.java

@@ -42,5 +42,15 @@ public interface ArticlePublishRangeDao extends BaseDao<ArticlePublishRangeEntit
 	 * @param createDate
 	 * @return
 	 */
-	List<ArticleGridPublishedSummaryDTO> selectByCreatedDate(@Param("customerId") String customerId, @Param("createDate") Date createDate);
+	List<ArticleGridPublishedSummaryDTO> getAllPublishedCount(@Param("customerId") String customerId, @Param("createDate") Date createDate);
+
+	/**
+	 * desc: 根据客户Id、创建日期查询某一天的 文章发布数据
+	 *
+	 * @param customerId
+	 * @param startDate
+	 * @param endDate
+	 * @return: List<ArticleGridPublishedSummaryDTO>
+	 */
+	List<ArticleGridPublishedSummaryDTO> getOneDayPublishedCount(@Param("customerId") String customerId, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/project/ProjectProcessEntity.java

@@ -0,0 +1,90 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.project;
+
+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-05-11
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("project_process")
+public class ProjectProcessEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 项目所属机关Id
+     */
+	private String agencyId;
+
+    /**
+     * 项目ID
+     */
+	private String projectId;
+
+	/**
+	 * 部门名
+	 */
+	private String departmentName;
+
+    /**
+     * 负负责人ID
+     */
+	private String staffId;
+
+    /**
+     * 处理：结案close，退回return，部门流转transfer，创建项目created
+     */
+	private String operation;
+
+	/**
+	 * 处理名
+	 */
+	private String operationName;
+
+    /**
+     * 公开答复
+     */
+	private String publicReply;
+
+    /**
+     * 内部备注
+     */
+	private String internalRemark;
+
+    /**
+     * 结束时间
+     */
+	private Date endTime;
+
+    /**
+     * 耗费天数
+     */
+	private String costWorkdays;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedAgencyDailyEntity.java

@@ -0,0 +1,88 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章发布数量【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedDepartmentDailyEntity.java

@@ -0,0 +1,88 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章发布数量【部门】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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 depsartmentId;
+
+    /**
+     * 文章累计发文数量 文章数量
+     */
+	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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactArticlePublishedGridDailyEntity.java

@@ -0,0 +1,88 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章发布数量【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedAgencyDailyEntity.java

@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_agency_daily")
+public class FactTagUsedAgencyDailyEntity 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 usedCount;
+
+    /**
+     * 日期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：2020-06 = 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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedAgencyMonthlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【机关】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_agency_monthly")
+public class FactTagUsedAgencyMonthlyEntity 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 usedCount;
+
+    /**
+     * 月份ID 月份ID   eg：202006 = 2020年6月、202007 = 2020年7月
+     */
+	private String monthId;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedAgencyQuarterlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【机关】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_agency_quarterly")
+public class FactTagUsedAgencyQuarterlyEntity 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 usedCount;
+
+    /**
+     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
+     */
+	private String quarterId;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedAgencyYearlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【机关】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_agency_yearly")
+public class FactTagUsedAgencyYearlyEntity 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 usedCount;
+
+    /**
+     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
+     */
+	private String yearId;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedDepartmentDailyEntity.java

@@ -0,0 +1,98 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【部门】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_department_daily")
+public class FactTagUsedDepartmentDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 上级机关ID 上级机关ID
+     */
+	private String pid;
+
+    /**
+     * 文章发布所属机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 部门ID
+     */
+	private String departmentId;
+
+    /**
+     * 标签ID 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 标签使用次数 标签的使用次数
+     */
+	private Integer usedCount;
+
+    /**
+     * 日期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月、202007 = 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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedDepartmentMonthlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【部门】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_department_monthly")
+public class FactTagUsedDepartmentMonthlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 文章发布所属机关ID 文章发布所属机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 部门ID
+     */
+	private String departmentId;
+
+    /**
+     * 标签ID 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 标签使用次数 标签的使用次数
+     */
+	private Integer usedCount;
+
+    /**
+     * 月份ID 月份ID   eg：202006 = 2020年6月、202007 = 2020年7月
+     */
+	private String monthId;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedDepartmentQuarterlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【部门】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_department_quarterly")
+public class FactTagUsedDepartmentQuarterlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 文章发布所属机关ID 文章发布所属机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 部门ID
+     */
+	private String departmentId;
+
+    /**
+     * 标签ID 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 标签使用次数 标签的使用次数
+     */
+	private Integer usedCount;
+
+    /**
+     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
+     */
+	private String quarterId;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedDepartmentYearlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【部门】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_department_yearly")
+public class FactTagUsedDepartmentYearlyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 文章发布所属机关ID 文章发布所属机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 部门ID
+     */
+	private String departmentId;
+
+    /**
+     * 标签ID 标签ID
+     */
+	private String tagId;
+
+    /**
+     * 标签名称 标签名称
+     */
+	private String tagName;
+
+    /**
+     * 标签使用次数 标签的使用次数
+     */
+	private Integer usedCount;
+
+    /**
+     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
+     */
+	private String yearId;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedGridDailyEntity.java

@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_grid_daily")
+public class FactTagUsedGridDailyEntity 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 usedCount;
+
+    /**
+     * 日期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月、202007 = 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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedGridMonthlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【网格】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_grid_monthly")
+public class FactTagUsedGridMonthlyEntity 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 usedCount;
+
+    /**
+     * 月份ID 月份ID   eg：2020-06 = 2020年6月、2020-07 = 2020年7月
+     */
+	private String monthId;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedGridQuarterlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【网格】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_grid_quarterly")
+public class FactTagUsedGridQuarterlyEntity 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 usedCount;
+
+    /**
+     * 季度ID 季度ID   eg：2020Q1 = 2020年第一季度、2020Q2 = 2020年第二季度、2020Q3 = 2020年第三季度、2020Q4 = 2020年第四季度
+     */
+	private String quarterId;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagUsedGridYearlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 标签【网格】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_tag_used_grid_yearly")
+public class FactTagUsedGridYearlyEntity 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 usedCount;
+
+    /**
+     * 年度ID 年度ID   eg：2020 = 2020年、2021 = 2021年
+     */
+	private String yearId;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagViewedAgencyDailyEntity.java

@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章引用标签阅读数量【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagViewedAgencyMonthlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章引用标签阅读数量【机关】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagViewedAgencyQuarterlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章引用标签阅读数量【机关】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagViewedAgencyYearlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章引用标签阅读数量【机关】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagViewedGridDailyEntity.java

@@ -0,0 +1,93 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章引用标签阅读数量【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagViewedGridMonthlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章引用标签阅读数量【网格】月统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagViewedGridQuarterlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章引用标签阅读数量【网格】季度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/stats/FactTagViewedGridYearlyEntity.java

@@ -0,0 +1,73 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.entity.stats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 文章引用标签阅读数量【网格】年度统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@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;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsProjectService.java

@@ -14,4 +14,12 @@ public interface StatsProjectService {
      * @Description 数据-项目-机关日(月)统计
      **/
     void statsAgencyProject(String customerId);
+
+    /**
+     * @param customerId
+     * @return
+     * @Author sun
+     * @Description 数据-项目-网格日(月)统计
+     **/
+    void statsGridProject(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/StatsPublicityService.java

@@ -1,15 +1,17 @@
 package com.epmet.service;
 
 
+import java.util.Date;
+
 public interface StatsPublicityService {
     /**
      * desc:  统计宣传能力的汇总信息
      *
-     * return:
+     * @return: Boolean
      * @date: 2020/6/17 16:11
      * @author: jianjun liu
      * email:liujianjun@git.elinkit.com.cn
      */
-    Boolean publicitySummary();
+    Boolean publicitySummary(Date statsDate);
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/group/impl/GroupDataServiceImpl.java

@@ -32,6 +32,11 @@ public class GroupDataServiceImpl implements GroupDataService {
     @Autowired
     private DimDateDao dimDateDao;
 
+    public DimTimeResultDTO getTimeDim(){
+        String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", "");
+        return dimDateDao.selectDimTime(dateId);
+    }
+
     /**
      * @Description  统计 “小组” 有关数据， dim：【网格-日】
      * @param customerId
@@ -40,8 +45,7 @@ public class GroupDataServiceImpl implements GroupDataService {
      */
     @Override
     public List<GroupGridDailyResultDTO> groupGridDaily(String customerId, List<CustomerGridInfoResultDTO> gridsInfo) {
-        String dateId = LocalDate.now().minusDays(NumConstant.ONE).toString().replace("-", "");
-        DimTimeResultDTO dimTime = dimDateDao.selectDimTime(dateId);
+        DimTimeResultDTO dimTime = this.getTimeDim();
         List<GroupGridDailyResultDTO> result = new ArrayList<>();
 
         // 1. 网格下有多少小组，只算   state = ‘approved’
@@ -104,7 +108,7 @@ public class GroupDataServiceImpl implements GroupDataService {
         //TODO 网格下小组增量
         GroupIncrFormDTO groupIncr = new GroupIncrFormDTO();
         groupIncr.setCustomerId(customerId);
-        groupIncr.setYesterday(dateId);
+        groupIncr.setYesterday(dimTime.getDateId());
         List<GroupIncrResultDTO> groupIncrResult = groupDataDao.selectGroupIncr(groupIncr);
         result.forEach(grid -> {
             groupIncrResult.forEach(gridIncr -> {

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java

@@ -1,13 +1,30 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.constant.ProjectConstant;
+import com.epmet.dto.stats.DimAgencyDTO;
+import com.epmet.dto.stats.DimDateDTO;
+import com.epmet.entity.project.ProjectEntity;
+import com.epmet.entity.project.ProjectProcessEntity;
+import com.epmet.entity.stats.DimDateEntity;
+import com.epmet.entity.stats.FactAgencyProjectDailyEntity;
 import com.epmet.service.StatsProjectService;
+import com.epmet.service.project.ProjectProcessService;
 import com.epmet.service.project.ProjectService;
 import com.epmet.service.stats.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.text.DateFormat;
+import java.text.NumberFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /**
  * 数据统计-项目（独立于任何具体数据源外层的service）
+ *
  * @author sun
  */
 @Service
@@ -28,6 +45,8 @@ public class StatsProjectServiceImpl implements StatsProjectService {
     @Autowired
     private ProjectService projectService;
     @Autowired
+    private ProjectProcessService projectProcessService;
+    @Autowired
     private FactAgencyProjectDailyService factAgencyProjectDailyService;
     @Autowired
     private FactAgencyProjectMonthlyService factAgencyProjectMonthlyService;
@@ -44,6 +63,192 @@ public class StatsProjectServiceImpl implements StatsProjectService {
      **/
     @Override
     public void statsAgencyProject(String customerId) {
+        //1:执行机关日数据统计
+        agencyDateProjectStats(customerId);
+        //2:执行机关月数据统计
+        if (Calendar.getInstance().get(Calendar.DATE) == 1) {
+            agencyMonthProjectStats(customerId);
+        }
+
+    }
+
+    /**
+     * @param customerId
+     * @Author sun
+     * @Description 数据-项目-机关日统计
+     **/
+    private String agencyDateProjectStats(String customerId) {
+        Date date = yesterDay();
+        //1:查询各维度表Id,方便使用 //TODO
+        DimDateDTO dimDateDTO = new DimDateDTO();
+        dimDateDTO.setCreatedTime(date);
+        dimDateDTO = dimDateService.getDimDate(dimDateDTO).get(0);
 
+        //2:根据客户Id查询机关维度表数据
+        DimAgencyDTO dimAgencyDTO = new DimAgencyDTO();
+        dimAgencyDTO.setCustomerId(customerId);
+        List<DimAgencyDTO> dimAgencyList = dimAgencyService.getDimAgencyList(dimAgencyDTO);
+        if (null == dimAgencyList || dimAgencyList.size() < NumConstant.ONE) {
+            return null;
+        }
+
+        //3:根据客户Id查询项目业务表数据
+        List<ProjectEntity> projectList = projectService.getProjectList(customerId);
+
+        //4:查询项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy-mm-dd格式字段值)
+        List<ProjectProcessEntity> processList = projectProcessService.getProcessList(customerId);
+
+        //5:遍历统计每个机关各项指标数
+        //批量机关日统计新增对象
+        List<FactAgencyProjectDailyEntity> dimDateEntityList = new ArrayList<>();
+        //计算百分比使用，保留小数点后两位
+        NumberFormat numberFormat = NumberFormat.getInstance();
+        numberFormat.setMaximumFractionDigits(2);
+        //遍历机关维度数据
+        for (DimAgencyDTO agency : dimAgencyList) {
+            //存放当前机关及所有下级机关Id
+            Map map = new HashMap<>();
+            map.put(agency.getId(), agency.getId());
+            String subPids = ((null == agency.getPids() || "".equals(agency.getPids())) ? agency.getId() : agency.getPids() + ":" + agency.getId());
+            dimAgencyList.forEach(sub -> {
+                if (sub.getPids().contains(subPids)) {
+                    map.put(sub.getId(), sub.getId());
+                }
+            });
+            //机关下截止当前日期的项目总数、处理中总数、已结案总数、已结案已解决总数、已结案未解决总数
+            AtomicInteger projectTotal = new AtomicInteger(0);
+            AtomicInteger pendingTotal = new AtomicInteger(0);
+            AtomicInteger closedTotal = new AtomicInteger(0);
+            AtomicInteger resolvedTotal = new AtomicInteger(0);
+            AtomicInteger unResolvedTotal = new AtomicInteger(0);
+            //存放当前机关及下级已结案切已解决的项目信息
+            Map resolvedMap = new HashMap<>();
+            //存放当前机关及下级已结案切未解决的项目信息
+            Map unResolvedMap = new HashMap<>();
+            //遍历项目数据，统计不同数据值
+            projectList.forEach(project -> {
+                if (map.containsKey(project.getAgencyId())) {
+                    projectTotal.addAndGet(1);
+                    if (ProjectConstant.PENDING.equals(project.getStatus())) {
+                        pendingTotal.addAndGet(1);
+                    }
+                    if (ProjectConstant.CLOSED.equals(project.getStatus())) {
+                        closedTotal.addAndGet(1);
+                        if (ProjectConstant.RESOLVED.equals(project.getClosedStatus())) {
+                            resolvedTotal.addAndGet(1);
+                            resolvedMap.put(project.getAgencyId(), project.getClosedStatus());
+                        }
+                        if (ProjectConstant.UNRESOLVED.equals(project.getClosedStatus())) {
+                            unResolvedTotal.addAndGet(1);
+                            unResolvedMap.put(project.getAgencyId(), project.getClosedStatus());
+                        }
+                    }
+                }
+            });
+            //日增量中项目总数、处理中总数、已结案总数、已结案已解决总数、已结案未解决总数
+            AtomicInteger pendingIncr = new AtomicInteger(0);
+            AtomicInteger closedIncr = new AtomicInteger(0);
+            AtomicInteger resolvedIncr = new AtomicInteger(0);
+            AtomicInteger unResolvedIncr = new AtomicInteger(0);
+            //遍历项目进展列表数据，统计日增量数据
+            processList.forEach(process -> {
+                if (date.equals(process.getCreatedTime())) {
+                    if (ProjectConstant.CREATED.equals(process.getOperation())) {
+                        pendingIncr.addAndGet(1);
+                    }
+                    if (ProjectConstant.CLOSE.equals(process.getOperation())) {
+                        closedIncr.addAndGet(1);
+                    }
+                    if (resolvedMap.containsKey(process.getAgencyId())) {
+                        resolvedIncr.addAndGet(1);
+                    }
+                    if (unResolvedMap.containsKey(process.getAgencyId())) {
+                        unResolvedIncr.addAndGet(1);
+                    }
+                }
+            });
+            //封装日数据对象
+            FactAgencyProjectDailyEntity agencyDailyEntity = new FactAgencyProjectDailyEntity();
+            agencyDailyEntity.setCustomerId(customerId);
+            agencyDailyEntity.setAgencyId(agency.getId());
+            agencyDailyEntity.setParentId(agency.getPid());
+            //TODO
+            agencyDailyEntity.setDateId("");
+            agencyDailyEntity.setWeekId("");
+            agencyDailyEntity.setMonthId("");
+            agencyDailyEntity.setYearId("");
+            agencyDailyEntity.setProjectTotal(projectTotal.intValue());
+            agencyDailyEntity.setPendingTotal(pendingTotal.intValue());
+            agencyDailyEntity.setClosedTotal(closedTotal.intValue());
+            agencyDailyEntity.setResolvedTotal(resolvedTotal.intValue());
+            agencyDailyEntity.setUnresolvedTotal(unResolvedTotal.intValue());
+            if (projectTotal.intValue() > NumConstant.ZERO) {
+                agencyDailyEntity.setPendingRatio(new BigDecimal(numberFormat.format((float) pendingTotal.intValue() / (float) projectTotal.intValue() * 100)));
+                agencyDailyEntity.setClosedRatio(new BigDecimal(numberFormat.format((float) closedTotal.intValue() / (float) projectTotal.intValue() * 100)));
+            }
+            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.setProjectIncr(pendingIncr.intValue() + closedIncr.intValue());
+            agencyDailyEntity.setPendingIncr(pendingIncr.intValue());
+            agencyDailyEntity.setClosedIncr(closedIncr.intValue());
+            agencyDailyEntity.setResolvedIncr(resolvedIncr.intValue());
+            agencyDailyEntity.setUnresolvedIncr(unResolvedIncr.intValue());
+
+            dimDateEntityList.add(agencyDailyEntity);
+        }
+
+        //6:批量保存机关日统计数据
+        if (null != dimDateEntityList && dimDateEntityList.size() > NumConstant.ZERO) {
+            factAgencyProjectDailyService.insertBatch(dimDateEntityList);
+        }
+        return null;
     }
+
+    /**
+     * @param customerId
+     * @Author sun
+     * @Description 数据-项目-机关月统计
+     **/
+    private void agencyMonthProjectStats(String customerId) {
+
+    }
+
+    /**
+     * @param customerId
+     * @return
+     * @Author sun
+     * @Description 数据-项目-网格日(月)统计
+     **/
+    @Override
+    public void statsGridProject(String customerId) {
+        //1:查询各维度表Id，方便使用
+        //2:根据客户Id查询网格维度表数据
+        //3:根据客户Id查询项目业务表数据
+        //4:查询项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy-mm-dd格式字段值)
+        //5:根据客户Id查询议题表已转项目的议题数据(为了匹配项目所属的网格Id)
+        //6:遍历统计每个网格各项指标数据
+        //7:批量保存网格日统计数据
+        //8:判断当前日期是否为当月首日，执行网格月数据统计
+    }
+
+    /**
+     * @Author sun
+     * @Description 获取当前日期的前一天日期（yyyy-mm-dd）
+     **/
+    private Date yesterDay() {
+        Date date = new Date();
+        try {
+            DateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            Calendar calendar = Calendar.getInstance();
+            calendar.set(Calendar.HOUR_OF_DAY, -24);
+            String str = sdf.format(calendar.getTime());
+            date = sdf.parse(str);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return date;
+    }
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java

@@ -2,6 +2,7 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.dto.stats.ArticleGridPublishedSummaryDTO;
+import com.epmet.entity.stats.DimGridEntity;
 import com.epmet.service.StatsPublicityService;
 import com.epmet.service.stats.*;
 import com.epmet.service.voice.ArticlePublishRangeService;
@@ -36,33 +37,41 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 	private DimYearService dimYearService;
 	@Autowired
 	private DimCustomerService dimCustomerService;
+	@Autowired
+	private DimGridService dimGridService;
 
 	@Autowired
 	private ArticlePublishRangeService articlePublishRangeService;
+	@Autowired
+	private FactArticlePublishedGridDailyService factArticlePublishedGridDailyService;
 
 	@Override
-	public Boolean publicitySummary() {
+	public Boolean publicitySummary(Date statsDate) {
+		if (statsDate == null) {
+			statsDate = DateUtils.addDateDays(new Date(), -1);
+		}
 		int pageNo = 1;
 		int pageSize = 100;
 		List<String> customerIdList = null;
 		do {
-			customerIdList = dimCustomerService.selectCustomerIdPage(pageNo, (pageNo - 1) * pageSize);
+			customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
 			if (!CollectionUtils.isEmpty(customerIdList)) {
-				customerIdList.forEach(customerId -> {
+				for (String customerId : customerIdList) {//获取所有网格
+					List<DimGridEntity> gridDTOList = dimGridService.getGridListByCustomerId(customerId);
+					if (!CollectionUtils.isEmpty(gridDTOList)) {
+						List<ArticleGridPublishedSummaryDTO> publishedArticleCount = articlePublishRangeService.getAllPublishedCount(customerId, statsDate);
+					}
 
-				});
+				}
 			}
-
 		} while (!CollectionUtils.isEmpty(customerIdList) || customerIdList.size() >= pageSize);
 		return null;
 	}
 
-	private String statsPublishArticle(String customerId, Date statsDate) {
-		//1.先查询昨天的 有没有数据 有则 昨日发布文章总数 = 昨日的发布文章数增量 + 统计表中已有的昨日的网格总数 ；
-		// 否则 昨日发布文章总数 = 发布范围表中计算所有发布文章总数
+	private List<ArticleGridPublishedSummaryDTO> statsPublishArticle(String customerId, Date statsDate) {
+		List<ArticleGridPublishedSummaryDTO> articleCount = articlePublishRangeService.getAllPublishedCount(customerId, statsDate);
 
-		List<ArticleGridPublishedSummaryDTO> articleCount = articlePublishRangeService.selectByCreatedDate(customerId, statsDate == null ? DateUtils.addDateDays(new Date(), -1) : statsDate);
 
-		return null;
+		return articleCount;
 	}
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java

@@ -0,0 +1,39 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.project;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.project.ProjectProcessEntity;
+
+import java.util.List;
+
+/**
+ * 项目处理进展表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+public interface ProjectProcessService extends BaseService<ProjectProcessEntity> {
+
+    /**
+     * @param customerId
+     * @Author sun
+     * @Description 查询客户项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy-mm-dd格式字段值)
+     **/
+    List<ProjectProcessEntity> getProcessList(String customerId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectService.java

@@ -20,6 +20,8 @@ package com.epmet.service.project;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.entity.project.ProjectEntity;
 
+import java.util.List;
+
 /**
  * 项目表
  *
@@ -28,4 +30,10 @@ import com.epmet.entity.project.ProjectEntity;
  */
 public interface ProjectService extends BaseService<ProjectEntity> {
 
+    /**
+     * @param customerId
+     * @Author sun
+     * @Description 根据客户Id查询客户项目业务表有效数据
+     **/
+    List<ProjectEntity> getProjectList(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.project.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.project.ProjectProcessDao;
+import com.epmet.entity.project.ProjectProcessEntity;
+import com.epmet.service.project.ProjectProcessService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 项目处理进展表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-05-11
+ */
+@Service
+public class ProjectProcessServiceImpl extends BaseServiceImpl<ProjectProcessDao, ProjectProcessEntity> implements ProjectProcessService {
+
+    /**
+     * @param customerId
+     * @Author sun
+     * @Description 查询客户项目处理进展表中是创建项目和结案两种进展的有效数据(创建日期截取yyyy-mm-dd格式字段值)
+     **/
+    @Override
+    public List<ProjectProcessEntity> getProcessList(String customerId) {
+        return baseDao.selectProcessList(customerId);
+    }
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectServiceImpl.java

@@ -26,6 +26,8 @@ import com.epmet.service.project.ProjectService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 项目表
  *
@@ -35,7 +37,15 @@ import org.springframework.stereotype.Service;
 @Service
 @DataSource(DataSourceConstant.GOV_PROJECT)
 public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntity> implements ProjectService {
-	@Autowired
-	private ProjectDao projectDao;
+
+	/**
+	 * @param customerId
+	 * @Author sun
+	 * @Description 根据客户Id查询客户项目业务表有效数据
+	 **/
+	@Override
+	public List<ProjectEntity> getProjectList(String customerId) {
+		return baseDao.selectProjectList(customerId);
+	}
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/DimGridService.java

@@ -20,12 +20,8 @@ package com.epmet.service.stats;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.stats.DimGridDTO;
-import com.epmet.entity.org.CustomerAgencyEntity;
-import com.epmet.entity.org.CustomerGridEntity;
 import com.epmet.entity.stats.DimGridEntity;
-import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -100,4 +96,14 @@ public interface DimGridService extends BaseService<DimGridEntity> {
     DimGridEntity getLastCreatedGridDim();
 
     void addGridDims(List<DimGridEntity> gridDims);
+
+    /**
+     * desc:  根据客户Id获取 该客户下所有的网格数据
+     *
+     * @param customerId
+     * @return: List<DimGridEntity>
+     * @date: 2020/6/18 10:28
+     * @author: jianjun liu
+     */
+    List<DimGridEntity> getGridListByCustomerId(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactArticlePublishedAgencyDailyService.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
+
+/**
+ * 文章发布数量【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+public interface FactArticlePublishedAgencyDailyService extends BaseService<FactArticlePublishedAgencyDailyEntity> {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactArticlePublishedDepartmentDailyService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.stats.FactArticlePublishedDepartmentDailyEntity;
+
+/**
+ * 文章发布数量【部门】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+public interface FactArticlePublishedDepartmentDailyService extends BaseService<FactArticlePublishedDepartmentDailyEntity> {
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactArticlePublishedGridDailyService.java

@@ -0,0 +1,44 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
+import com.epmet.entity.stats.FactArticlePublishedGridDailyEntity;
+
+import java.util.List;
+
+/**
+ * 文章发布数量【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+public interface FactArticlePublishedGridDailyService extends BaseService<FactArticlePublishedGridDailyEntity> {
+
+	/**
+	 * desc:  根据客户Id 获取统计日期的 数据
+	 *
+	 * @param customerId
+	 * @param dateId
+	 * @return: List<FactArticlePublishedAgencyDailyEntity>
+	 * @date: 2020/6/18 9:53
+	 * @author: jianjun liu
+	 */
+	List<FactArticlePublishedAgencyDailyEntity> getByBeforeDay(String customerId, String dateId);
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimCustomerServiceImpl.java

@@ -28,7 +28,6 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.stats.DimCustomerDao;
 import com.epmet.dto.stats.DimCustomerDTO;
 import com.epmet.entity.crm.CustomerEntity;
-import com.epmet.entity.org.CustomerDepartmentEntity;
 import com.epmet.entity.stats.DimCustomerEntity;
 import com.epmet.service.stats.DimCustomerService;
 import lombok.extern.slf4j.Slf4j;
@@ -109,7 +108,7 @@ public class DimCustomerServiceImpl extends BaseServiceImpl<DimCustomerDao, DimC
             log.error("selectCustomerIdPage param error,pageNo:{},pageSize:{}", pageNo, pageSize);
             throw new RenException(EpmetErrorCode.CUSTOMER_VALIDATE_ERROR.getCode(), EpmetErrorCode.CUSTOMER_VALIDATE_ERROR.getMsg());
         }
-        return baseDao.selectCustomerIdPage(pageNo, (pageNo - 1) * pageSize);
+        return baseDao.selectCustomerIdPage((pageNo - 1) * pageSize,pageSize);
     }
 
     @Transactional

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/DimGridServiceImpl.java

@@ -20,13 +20,13 @@ package com.epmet.service.stats.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
-import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.dao.stats.DimGridDao;
 import com.epmet.dto.stats.DimGridDTO;
-import com.epmet.entity.org.CustomerAgencyEntity;
-import com.epmet.entity.stats.DimAgencyEntity;
 import com.epmet.entity.stats.DimGridEntity;
 import com.epmet.service.stats.DimGridService;
 import org.apache.commons.lang3.StringUtils;
@@ -34,7 +34,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -111,4 +110,12 @@ public class DimGridServiceImpl extends BaseServiceImpl<DimGridDao, DimGridEntit
             baseDao.insert(gridDim);
         }
     }
+
+	@Override
+	public List<DimGridEntity> getGridListByCustomerId(String customerId) {
+        if (StringUtils.isBlank(customerId)){
+            throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
+        }
+       return baseDao.getGridListByCustomerId(customerId);
+	}
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedAgencyDailyServiceImpl.java

@@ -0,0 +1,38 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.stats.FactArticlePublishedAgencyDailyDao;
+import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
+import com.epmet.service.stats.FactArticlePublishedAgencyDailyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 文章发布数量【机关】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Service
+public class FactArticlePublishedAgencyDailyServiceImpl extends BaseServiceImpl<FactArticlePublishedAgencyDailyDao, FactArticlePublishedAgencyDailyEntity> implements FactArticlePublishedAgencyDailyService {
+
+
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedDepartmentDailyServiceImpl.java

@@ -0,0 +1,36 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.dao.stats.FactArticlePublishedDepartmentDailyDao;
+import com.epmet.entity.stats.FactArticlePublishedDepartmentDailyEntity;
+import com.epmet.service.stats.FactArticlePublishedDepartmentDailyService;
+import org.springframework.stereotype.Service;
+
+/**
+ * 文章发布数量【部门】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Service
+public class FactArticlePublishedDepartmentDailyServiceImpl extends BaseServiceImpl<FactArticlePublishedDepartmentDailyDao, FactArticlePublishedDepartmentDailyEntity> implements FactArticlePublishedDepartmentDailyService {
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactArticlePublishedGridDailyServiceImpl.java

@@ -0,0 +1,52 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.service.stats.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.dao.stats.FactArticlePublishedGridDailyDao;
+import com.epmet.entity.stats.FactArticlePublishedAgencyDailyEntity;
+import com.epmet.entity.stats.FactArticlePublishedGridDailyEntity;
+import com.epmet.service.stats.FactArticlePublishedGridDailyService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 文章发布数量【网格】日统计表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-06-18
+ */
+@Slf4j
+@Service
+public class FactArticlePublishedGridDailyServiceImpl extends BaseServiceImpl<FactArticlePublishedGridDailyDao, FactArticlePublishedGridDailyEntity> implements FactArticlePublishedGridDailyService {
+
+
+	@Override
+	public List<FactArticlePublishedAgencyDailyEntity> getByBeforeDay(String customerId, String dateId) {
+		log.debug("getByBeforeDay param customerId:{},dateId:{}",customerId,dateId);
+		if (StringUtils.isBlank(customerId) || StringUtils.isBlank(dateId)){
+			throw new RenException(EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getCode(),EpmetErrorCode.INTERNAL_VALIDATE_ERROR.getMsg());
+		}
+		return baseDao.getByBeforeDay(customerId,dateId);
+	}
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/ArticlePublishRangeService.java

@@ -32,15 +32,28 @@ import java.util.List;
  */
 public interface ArticlePublishRangeService extends BaseService<ArticlePublishRangeEntity> {
 
-    /**
-     * desc:  根据客户Id 、创建日期查询 发布范围数据
-     *
-     * @param customerId
-     * @param createDate
-     * return:
-     * @date: 2020/6/17 16:59
-     * @author: jianjun liu
-     * email:liujianjun@git.elinkit.com.cn
-     */
-    List<ArticleGridPublishedSummaryDTO> selectByCreatedDate(String customerId, Date createDate);
+	/**
+	 * desc:  根据客户Id 、创建日期查询 有史以来所有的发布文章总数
+	 *
+	 * @param customerId
+	 * @param createDate
+	 * @return: List<ArticleGridPublishedSummaryDTO>
+	 * @date: 2020/6/17 16:59
+	 * @author: jianjun liu
+	 * email:liujianjun@git.elinkit.com.cn
+	 */
+	List<ArticleGridPublishedSummaryDTO> getAllPublishedCount(String customerId, Date createDate);
+
+	/**
+	 * desc: 根据客户Id、创建日期查询某一天的 文章发布数据
+	 *
+	 * @param customerId
+	 * @param startDate
+	 * @param endDate
+	 * @return: List<ArticleGridPublishedSummaryDTO>
+	 * @date: 2020/6/17 21:43
+	 * @author: jianjun liu
+	 * email:liujianjun@git.elinkit.com.cn
+	 */
+	List<ArticleGridPublishedSummaryDTO> getOneDayPublishedCount(String customerId, Date startDate, Date endDate);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/voice/impl/ArticlePublishRangeServiceImpl.java

@@ -24,6 +24,7 @@ import com.epmet.dao.voice.ArticlePublishRangeDao;
 import com.epmet.dto.stats.ArticleGridPublishedSummaryDTO;
 import com.epmet.entity.voice.ArticlePublishRangeEntity;
 import com.epmet.service.voice.ArticlePublishRangeService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -35,13 +36,32 @@ import java.util.List;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-06-17
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.GOV_VOICE)
 public class ArticlePublishRangeServiceImpl extends BaseServiceImpl<ArticlePublishRangeDao, ArticlePublishRangeEntity> implements ArticlePublishRangeService {
 
 
-    @Override
-    public List<ArticleGridPublishedSummaryDTO> selectByCreatedDate(String customerId, Date createDate) {
-        return baseDao.selectByCreatedDate(customerId,createDate);
-    }
+	@Override
+	public List<ArticleGridPublishedSummaryDTO> getAllPublishedCount(String customerId, Date createDate) {
+		log.debug("getAllPublishedCount param customerId:{},createDate:{}", customerId, createDate);
+		return baseDao.getAllPublishedCount(customerId, createDate);
+	}
+
+	/**
+	 * desc: 根据客户Id、创建日期查询某一天的 文章发布数据
+	 *
+	 * @param customerId
+	 * @param startDate
+	 * @param endDate
+	 * @return: List<ArticleGridPublishedSummaryDTO>
+	 * @date: 2020/6/17 21:43
+	 * @author: jianjun liu
+	 * email:liujianjun@git.elinkit.com.cn
+	 */
+	@Override
+	public List<ArticleGridPublishedSummaryDTO> getOneDayPublishedCount(String customerId, Date startDate, Date endDate) {
+		log.debug("getOneDayPublishedCount param startDate:{},endDate:{}", startDate, endDate);
+		return baseDao.getOneDayPublishedCount(customerId, startDate, endDate);
+	}
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -3,5 +3,17 @@
 
 <mapper namespace="com.epmet.dao.project.ProjectDao">
 
+    <select id="selectProjectList" resultType="com.epmet.entity.project.ProjectEntity">
+        SELECT
+            *
+        FROM
+            project
+        WHERE
+            del_flag = '0'
+        <if test="customerId != null and customerId.trim() != ''">
+            AND customer_id = #{customerId}
+        </if>
+        ORDER BY created_time DESC
+    </select>
 
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.project.ProjectProcessDao">
+
+    <select id="selectProcessList" resultType="com.epmet.entity.project.ProjectProcessEntity">
+        SELECT
+            pro.project_id,
+            pro.operation,
+            DATE_FORMAT(pro.created_time, "%Y-%m-%d"),
+            p.agency_id
+        FROM
+            project_process pro
+        INNER JOIN project p ON pro.project_id = p.id
+        WHERE
+            pro.del_flag = '0'
+        AND p.del_flag = '0'
+        AND p.customer_id = #{customerId}
+        ORDER BY
+            pro.project_id
+    </select>
+
+</mapper>