议题主附表相应文件上传

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginIssueLogDailyDTO.java

@@ -0,0 +1,136 @@
+/**
+ * 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.extract;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ *  议题记录附表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-14
+ */
+@Data
+public class FactOriginIssueLogDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+	private String id;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 组织上级ID
+     */
+	private String pid;
+
+    /**
+     * 机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 日期ID
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月份ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年度ID
+     */
+	private String yearId;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 操作用户ID
+     */
+	private String operationUserId;
+
+    /**
+     * 动作CODE
+     */
+	private String actionCode;
+
+    /**
+     * 党员 热心居民 居民
+     */
+	private String userIdentity;
+
+    /**
+     * 删除状态，0:正常，1:删除
+     */
+	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/extract/FactOriginIssueMainDailyDTO.java

@@ -0,0 +1,151 @@
+/**
+ * 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.extract;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ *  议题主表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-14
+ */
+@Data
+public class FactOriginIssueMainDailyDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+	private String id;
+
+    /**
+     * 日ID（指议题创建的yyyymmdd）
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月份ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年度ID
+     */
+	private String yearId;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 用户身份标识
+     */
+	private String userIdentity;
+
+    /**
+     * 转议题用户ID
+     */
+	private String userId;
+
+    /**
+     * 创建话题用户的ID
+     */
+	private String createTopicUserId;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 转为议题的话题ID
+     */
+	private String topicId;
+
+    /**
+     * 议题网格ID
+     */
+	private String gridId;
+
+    /**
+     * 上级ID
+     */
+	private String pid;
+
+    /**
+     * 议题组织ID（网格所属组织ID）
+     */
+	private String agencyId;
+
+    /**
+     * 议题状态
+     */
+	private String issueStatus;
+
+    /**
+     * 创建话题用户身份标识
+     */
+	private String topicUserIdentity;
+
+    /**
+     * 删除状态，0:正常，1:删除
+     */
+	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/extract/form/IssueLogDailyFormDTO.java

@@ -0,0 +1,107 @@
+package com.epmet.dto.extract.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/14 5:42 下午
+ */
+@Data
+public class IssueLogDailyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 7036617958351476594L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 组织上级ID
+     */
+    private String pid;
+
+    /**
+     * 机关ID
+     */
+    private String agencyId;
+
+    /**
+     * 日期ID
+     */
+    private String dateId;
+
+    /**
+     * 周ID
+     */
+    private String weekId;
+
+    /**
+     * 月份ID
+     */
+    private String monthId;
+
+    /**
+     * 季度ID
+     */
+    private String quarterId;
+
+    /**
+     * 年度ID
+     */
+    private String yearId;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 操作用户ID
+     */
+    private String operationUserId;
+
+    /**
+     * 动作CODE
+     */
+    private String actionCode;
+
+    /**
+     * 党员 热心居民 居民
+     */
+    private String userIdentity;
+
+    /**
+     * 是否已删除(0-未删除，1-已删除)
+     */
+    private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建者
+     */
+    private String createdBy;
+
+    /**
+     * 修改者
+     */
+    private String updatedBy;
+
+    public IssueLogDailyFormDTO() {
+        this.delFlag = delFlag = 0;
+        this.revision = revision = 0;
+        this.createdBy = createdBy = "APP_USER";
+        this.updatedBy = updatedBy = "APP_USER";
+    }
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java

@@ -0,0 +1,107 @@
+package com.epmet.dto.extract.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/14 5:47 下午
+ */
+@Data
+public class IssueMainDailyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = -5288003778076157611L;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 网格ID
+     */
+    private String gridId;
+
+    /**
+     * 组织上级ID
+     */
+    private String pid;
+
+    /**
+     * 机关ID
+     */
+    private String agencyId;
+
+    /**
+     * 日期ID
+     */
+    private String dateId;
+
+    /**
+     * 周ID
+     */
+    private String weekId;
+
+    /**
+     * 月份ID
+     */
+    private String monthId;
+
+    /**
+     * 季度ID
+     */
+    private String quarterId;
+
+    /**
+     * 年度ID
+     */
+    private String yearId;
+
+    /**
+     * 议题ID
+     */
+    private String issueId;
+
+    /**
+     * 操作用户ID
+     */
+    private String operationUserId;
+
+    /**
+     * 动作CODE
+     */
+    private String actionCode;
+
+    /**
+     * 党员 热心居民 居民
+     */
+    private String userIdentity;
+
+    /**
+     * 是否已删除(0-未删除，1-已删除)
+     */
+    private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建者
+     */
+    private String createdBy;
+
+    /**
+     * 修改者
+     */
+    private String updatedBy;
+
+    public IssueMainDailyFormDTO() {
+        this.delFlag = delFlag = 0;
+        this.revision = revision = 0;
+        this.createdBy = createdBy = "APP_USER";
+        this.updatedBy = updatedBy = "APP_USER";
+    }
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueLogDailyDao.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.evaluationindex.extract;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.extract.form.IssueLogDailyFormDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginIssueLogDailyEntity;
+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-09-14
+ */
+@Mapper
+public interface FactOriginIssueLogDailyDao extends BaseDao<FactOriginIssueLogDailyEntity> {
+
+    /**
+     * @Description  议题记录附表插入
+     * @param issueLogList
+     * @author zxc
+     * @date 2020/9/14 5:53 下午
+     */
+    void insertIssueLogList(@Param("issueLogList")List<IssueLogDailyFormDTO> issueLogList);
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.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.dao.evaluationindex.extract;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.extract.form.IssueLogDailyFormDTO;
+import com.epmet.dto.extract.form.IssueMainDailyFormDTO;
+import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
+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-09-14
+ */
+@Mapper
+public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMainDailyEntity> {
+
+    /**
+     * @Description  议题主表插入
+     * @param issueMainList
+     * @author zxc
+     * @date 2020/9/14 5:53 下午
+     */
+    void insertIssueMainList(@Param("issueMainList") List<IssueMainDailyFormDTO> issueMainList);
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueLogDailyEntity.java

@@ -0,0 +1,106 @@
+/**
+ * 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.evaluationindex.extract;
+
+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-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_origin_issue_log_daily")
+public class FactOriginIssueLogDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 网格ID
+     */
+	private String gridId;
+
+    /**
+     * 组织上级ID
+     */
+	private String pid;
+
+    /**
+     * 机关ID
+     */
+	private String agencyId;
+
+    /**
+     * 日期ID
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月份ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年度ID
+     */
+	private String yearId;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 操作用户ID
+     */
+	private String operationUserId;
+
+    /**
+     * 动作CODE
+     */
+	private String actionCode;
+
+    /**
+     * 党员 热心居民 居民
+     */
+	private String userIdentity;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginIssueMainDailyEntity.java

@@ -0,0 +1,121 @@
+/**
+ * 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.evaluationindex.extract;
+
+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-09-14
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_origin_issue_main_daily")
+public class FactOriginIssueMainDailyEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 日ID（指议题创建的yyyymmdd）
+     */
+	private String dateId;
+
+    /**
+     * 周ID
+     */
+	private String weekId;
+
+    /**
+     * 月份ID
+     */
+	private String monthId;
+
+    /**
+     * 季度ID
+     */
+	private String quarterId;
+
+    /**
+     * 年度ID
+     */
+	private String yearId;
+
+    /**
+     * 客户ID
+     */
+	private String customerId;
+
+    /**
+     * 用户身份标识
+     */
+	private String userIdentity;
+
+    /**
+     * 转议题用户ID
+     */
+	private String userId;
+
+    /**
+     * 创建话题用户的ID
+     */
+	private String createTopicUserId;
+
+    /**
+     * 议题ID
+     */
+	private String issueId;
+
+    /**
+     * 转为议题的话题ID
+     */
+	private String topicId;
+
+    /**
+     * 议题网格ID
+     */
+	private String gridId;
+
+    /**
+     * 上级ID
+     */
+	private String pid;
+
+    /**
+     * 议题组织ID（网格所属组织ID）
+     */
+	private String agencyId;
+
+    /**
+     * 议题状态
+     */
+	private String issueStatus;
+
+    /**
+     * 创建话题用户身份标识
+     */
+	private String topicUserIdentity;
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/IssueExtractService.java

@@ -0,0 +1,8 @@
+package com.epmet.service.evaluationindex.extract;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/14 5:07 下午
+ */
+public interface IssueExtractService {
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/IssueExtractServiceImpl.java

@@ -0,0 +1,17 @@
+package com.epmet.service.evaluationindex.extract.impl;
+
+import com.epmet.service.evaluationindex.extract.IssueExtractService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/14 5:08 下午
+ */
+@Service
+@Slf4j
+public class IssueExtractServiceImpl implements IssueExtractService {
+
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueLogDailyDao.xml

@@ -0,0 +1,39 @@
+<?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.evaluationindex.extract.FactOriginIssueLogDailyDao">
+
+    <!-- 议题记录附表插入 -->
+    <insert id="insertIssueLogList">
+        INSERT INTO fact_origin_issue_log_daily ( ID, DATE_ID, WEEK_ID, MONTH_ID, QUARTER_ID, YEAR_ID, CUSTOMER_ID, USER_IDENTITY, USER_ID, CREATE_TOPIC_USER_ID, ISSUE_ID, TOPIC_ID, GRID_ID,
+                                                  PID, AGENCY_ID, ISSUE_STATUS, TOPIC_USER_IDENTITY, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        VALUES
+        <foreach collection="issueLogList" item="item" index="index" separator=",">
+            (
+                REPLACE ( UUID(), '-', '' ),
+                #{item.dateId},
+                #{item.weekId},
+                #{item.monthId},
+                #{item.quarterId},
+                #{item.yearId},
+                #{item.customerId},
+                #{item.userIdentity},
+                #{item.userId},
+                #{item.createTopicUserId},
+                #{item.issueId},
+                #{item.topicId},
+                #{item.gridId},
+                #{item.pid},
+                #{item.agencyId},
+                #{item.issueStatus},
+                #{item.topicUserIdentity},
+                #{item.delFlag},
+                #{item.revision},
+                #{item.createdBy},
+                NOW(),
+                #{item.updatedBy},
+                NOW()
+            )
+        </foreach>
+    </insert>
+</mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

@@ -0,0 +1,35 @@
+<?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.evaluationindex.extract.FactOriginIssueMainDailyDao">
+
+    <!-- 议题主表插入 -->
+    <insert id="insertIssueMainList">
+        INSERT INTO fact_origin_issue_main_daily(ID, CUSTOMER_ID, GRID_ID, PID, AGENCY_ID, DATE_ID, WEEK_ID, MONTH_ID, QUARTER_ID, YEAR_ID, ISSUE_ID, OPERATION_USER_ID, ACTION_CODE, USER_IDENTITY, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME)
+        VALUES
+        <foreach collection="issueMainList" item="item" index="index" separator=",">
+            (
+                REPLACE ( UUID(), '-', '' ),
+                #{item.customerId},
+                #{item.gridId},
+                #{item.pid},
+                #{item.agencyId},
+                #{item.dateId},
+                #{item.weekId},
+                #{item.monthId},
+                #{item.quarterId},
+                #{item.yearId},
+                #{item.issueId},
+                #{item.operationUserId},
+                #{item.actionCode},
+                #{item.userIdentity},
+                #{item.delFlag},
+                #{item.revision},
+                #{item.createdBy},
+                NOW(),
+                #{item.updatedBy},
+                NOW()
+            )
+        </foreach>
+    </insert>
+</mapper>