基础上报部分接口

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyGroupTotalFormDTO.java

@@ -52,37 +52,37 @@ public class AgencyGroupTotalFormDTO implements Serializable {
         /**
          * 周ID
          */
-        private String weekId;
+        private String weekId = "";
 
         /**
          * 月份ID
          */
-        private String monthId;
+        private String monthId = "";
 
         /**
          * 季度ID
          */
-        private String quarterId;
+        private String quarterId = "";
 
         /**
          * 年ID
          */
-        private String yearId;
+        private String yearId = "";
 
         /**
          * 当前组织及下级小组总数
          */
-        private Integer groupTotal;
+        private Integer groupTotal = 0;
 
         /**
          * 当前组织及下级楼院小组总数
          */
-        private Integer ordinaryTotal;
+        private Integer ordinaryTotal = 0;
 
         /**
          * 当前组织及下级支部小组总数
          */
-        private Integer branchTotal;
+        private Integer branchTotal = 0;
     }
 
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyHotTopicFormDTO.java

@@ -52,37 +52,37 @@ public class AgencyHotTopicFormDTO implements Serializable {
         /**
          * 周ID
          */
-        private String weekId;
+        private String weekId = "";
 
         /**
          * 月ID
          */
-        private String monthId;
+        private String monthId = "";
 
         /**
          * 季度ID
          */
-        private String quarterId;
+        private String quarterId = "";
 
         /**
          * 年ID
          */
-        private String yearId;
+        private String yearId = "";
 
         /**
          * 话题总数
          */
-        private Integer topicTotal;
+        private Integer topicTotal = 0;
 
         /**
          * 话题状态【热议中:hot_discuss】
          */
-        private String status;
+        private String status = "";
 
         /**
          * 状态话题数量
          */
-        private Integer topicCount;
+        private Integer topicCount = 0;
     }
 
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/AgencyRegUserFormDTO.java

@@ -29,7 +29,7 @@ public class AgencyRegUserFormDTO implements Serializable {
 
     @Data
     public static class DataList {
-
+        BigDecimal bi = new BigDecimal(0);
         /**
          * 客户id
          */
@@ -48,62 +48,62 @@ public class AgencyRegUserFormDTO implements Serializable {
         /**
          *
          */
-        private String weekId;
+        private String weekId = "";
 
         /**
          *
          */
-        private String yearId;
+        private String yearId = "";
 
         /**
          * 注册用户总数
          */
-        private Integer regTotal;
+        private Integer regTotal = 0;
 
         /**
          * 居民总数
          */
-        private Integer resiTotal;
+        private Integer resiTotal = 0;
 
         /**
          * 热心居民总数
          */
-        private Integer warmHeartedTotal;
+        private Integer warmHeartedTotal = 0;
 
         /**
          * 党员总数
          */
-        private Integer partymemberTotal;
+        private Integer partymemberTotal = 0;
 
         /**
          * 本日注册居民日增量
          */
-        private Integer regIncr;
+        private Integer regIncr = 0;
 
         /**
          * 本日热心居民日增量
          */
-        private Integer warmIncr;
+        private Integer warmIncr = 0;
 
         /**
          * 本日党员认证日增量
          */
-        private Integer partymemberIncr;
+        private Integer partymemberIncr = 0;
 
         /**
          * 居民总数占比
          */
-        private BigDecimal resiProportion;
+        private BigDecimal resiProportion = bi;
 
         /**
          * 党员总数占比
          */
-        private BigDecimal partymemberProportion;
+        private BigDecimal partymemberProportion = bi;
 
         /**
          * 热心居民占比
          */
-        private BigDecimal warmHeartedProportion;
+        private BigDecimal warmHeartedProportion = bi;
     }
 
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridGroupTotalFormDTO.java

@@ -52,37 +52,37 @@ public class GridGroupTotalFormDTO implements Serializable {
         /**
          * 周ID
          */
-        private String weekId;
+        private String weekId = "";
 
         /**
          * 月份ID
          */
-        private String monthId;
+        private String monthId = "";
 
         /**
          * 季度ID
          */
-        private String quarterId;
+        private String quarterId = "";
 
         /**
          * 年ID
          */
-        private String yearId;
+        private String yearId = "";
 
         /**
          * 网格下小组总数
          */
-        private Integer groupTotal;
+        private Integer groupTotal = 0;
 
         /**
          * 网格下楼院小组总数
          */
-        private Integer ordinaryTotal;
+        private Integer ordinaryTotal = 0;
 
         /**
          * 网格下支部小组总数
          */
-        private Integer branchTotal;
+        private Integer branchTotal = 0;
     }
 
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridHotTopicFormDTO.java

@@ -52,37 +52,37 @@ public class GridHotTopicFormDTO implements Serializable {
         /**
          * 周ID
          */
-        private String weekId;
+        private String weekId = "";
 
         /**
          * 月ID
          */
-        private String monthId;
+        private String monthId = "";
 
         /**
          * 季度ID
          */
-        private String quarterId;
+        private String quarterId = "";
 
         /**
          * 年ID
          */
-        private String yearId;
+        private String yearId = "";
 
         /**
          * 话题总数
          */
-        private Integer topicTotal;
+        private Integer topicTotal = 0;
 
         /**
          * 话题状态【热议中:hot_discuss】
          */
-        private String status;
+        private String status = "";
 
         /**
          * 状态话题数量
          */
-        private Integer topicCount;
+        private Integer topicCount = 0;
     }
 
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/basereport/form/GridRegUserFormDTO.java

@@ -30,7 +30,7 @@ public class GridRegUserFormDTO implements Serializable {
 
     @Data
     public static class DataList {
-
+        BigDecimal bi = new BigDecimal(0);
         /**
          * 客户id
          */
@@ -54,62 +54,62 @@ public class GridRegUserFormDTO implements Serializable {
         /**
          *  周维度Id
          */
-        private String weekId;
+        private String weekId = "";
 
         /**
          * 年维度Id
          */
-        private String yearId;
+        private String yearId = "";
 
         /**
          * 注册用户总数
          */
-        private Integer regTotal;
+        private Integer regTotal = 0;
 
         /**
          * 居民总数
          */
-        private Integer resiTotal;
+        private Integer resiTotal = 0;
 
         /**
          * 热心居民总数
          */
-        private Integer warmHeartedTotal;
+        private Integer warmHeartedTotal = 0;
 
         /**
          * 党员总数
          */
-        private Integer partymemberTotal;
+        private Integer partymemberTotal = 0;
 
         /**
          * 本日注册居民日增量
          */
-        private Integer regIncr;
+        private Integer regIncr = 0;
 
         /**
          * 本日热心居民日增量
          */
-        private Integer warmIncr;
+        private Integer warmIncr = 0;
 
         /**
          * 本日党员认证日增量
          */
-        private Integer partymemberIncr;
+        private Integer partymemberIncr = 0;
 
         /**
          * 居民总数占比
          */
-        private BigDecimal resiProportion;
+        private BigDecimal resiProportion = bi;
 
         /**
          * 党员总数占比
          */
-        private BigDecimal partymemberProportion;
+        private BigDecimal partymemberProportion = bi;
 
         /**
          * 热心居民占比
          */
-        private BigDecimal warmHeartedProportion;
+        private BigDecimal warmHeartedProportion = bi;
     }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml

@@ -133,27 +133,227 @@
     </insert>
 
     <delete id="delGridGroupTotal">
+        DELETE
+        FROM
+            fact_group_total_grid_daily
+        WHERE
+            customer_id = #{customerId}
+        AND date_id = #{dateId}
+        LIMIT 1000
     </delete>
 
     <insert id="insertBatchGridGroupTotal">
+        insert into fact_group_total_grid_daily
+        (
+        id,
+        customer_id,
+        agency_id,
+        grid_id,
+        date_id,
+        week_id,
+        month_id,
+        quarter_id,
+        year_id,
+        group_total,
+        ordinary_total,
+        branch_total,
+        del_flag,
+        revision,
+        created_by,
+        created_time,
+        updated_by,
+        updated_time
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.customerId},
+            #{item.agencyId},
+            #{item.gridId},
+            #{item.dateId},
+            #{item.weekId},
+            #{item.monthId},
+            #{item.quarterId},
+            #{item.yearId},
+            #{item.groupTotal},
+            #{item.ordinaryTotal},
+            #{item.branchTotal},
+            0,
+            0,
+            'BASE_REPORT',
+            now(),
+            'BASE_REPORT',
+            now()
+            )
+        </foreach>
     </insert>
 
     <delete id="delAgencyGroupTotal">
+        DELETE
+        FROM
+            fact_group_total_agency_daily
+        WHERE
+            customer_id = #{customerId}
+        AND date_id = #{dateId}
+        LIMIT 1000
     </delete>
 
     <insert id="insertBatchAgencyGroupTotal">
+        insert into fact_group_total_agency_daily
+        (
+        id,
+        customer_id,
+        agency_id,
+        pid,
+        date_id,
+        week_id,
+        month_id,
+        quarter_id,
+        year_id,
+        group_total,
+        ordinary_total,
+        branch_total,
+        del_flag,
+        revision,
+        created_by,
+        created_time,
+        updated_by,
+        updated_time
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.customerId},
+            #{item.agencyId},
+            #{item.pid},
+            #{item.dateId},
+            #{item.weekId},
+            #{item.monthId},
+            #{item.quarterId},
+            #{item.yearId},
+            #{item.groupTotal},
+            #{item.ordinaryTotal},
+            #{item.branchTotal},
+            0,
+            0,
+            'BASE_REPORT',
+            now(),
+            'BASE_REPORT',
+            now()
+            )
+        </foreach>
     </insert>
 
     <delete id="delGridHotTopic">
+        DELETE
+        FROM
+            fact_topic_hotdiscuss_grid_daily
+        WHERE
+            customer_id = #{customerId}
+        AND date_id = #{dateId}
+        LIMIT 1000
     </delete>
 
     <insert id="insertBatchGridHotTopic">
+        insert into fact_topic_hotdiscuss_grid_daily
+        (
+        id,
+        customer_id,
+        agency_id,
+        grid_id,
+        date_id,
+        week_id,
+        month_id,
+        quarter_id,
+        year_id,
+        topic_total,
+        status,
+        topic_count,
+        del_flag,
+        revision,
+        created_by,
+        created_time,
+        updated_by,
+        updated_time
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.customerId},
+            #{item.agencyId},
+            #{item.gridId},
+            #{item.dateId},
+            #{item.weekId},
+            #{item.monthId},
+            #{item.quarterId},
+            #{item.yearId},
+            #{item.topicTotal},
+            #{item.status},
+            #{item.topicCount},
+            0,
+            0,
+            'BASE_REPORT',
+            now(),
+            'BASE_REPORT',
+            now()
+            )
+        </foreach>
     </insert>
 
     <delete id="delAgencyHotTopic">
+        DELETE
+        FROM
+            fact_topic_hotdiscuss_agency_daily
+        WHERE
+            customer_id = #{customerId}
+        AND date_id = #{dateId}
+        LIMIT 1000
     </delete>
 
     <insert id="insertBatchAgencyHotTopic">
+        insert into fact_topic_hotdiscuss_agency_daily
+        (
+        id,
+        customer_id,
+        agency_id,
+        pid,
+        date_id,
+        week_id,
+        month_id,
+        quarter_id,
+        year_id,
+        topic_total,
+        status,
+        topic_count,
+        del_flag,
+        revision,
+        created_by,
+        created_time,
+        updated_by,
+        updated_time
+        ) values
+        <foreach collection="list" item="item" index="index" separator=",">
+            (
+            (SELECT REPLACE(UUID(), '-', '') AS id),
+            #{item.customerId},
+            #{item.agencyId},
+            #{item.pid},
+            #{item.dateId},
+            #{item.weekId},
+            #{item.monthId},
+            #{item.quarterId},
+            #{item.yearId},
+            #{item.topicTotal},
+            #{item.status},
+            #{item.topicCount},
+            0,
+            0,
+            'BASE_REPORT',
+            now(),
+            'BASE_REPORT',
+            now()
+            )
+        </foreach>
     </insert>
 
     <!-- 根据dateId删除客户组织项目数据 -->