feats

src/main/java/com/huiju/estateagents/common/ExcelUtils.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.common;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.huiju.estateagents.excel.ConsultantKPIExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+public class ExcelUtils {
+
+    /**
+     * 发送 excel 到客户端
+     * 暂时只支持单 sheet 页
+     * @param response
+     * @param data
+     * @param fileName
+     * @throws IOException
+     */
+    public static void flush(HttpServletResponse response, Class dataClass, List data, String fileName) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename="+StringUtils.strToUnicode(fileName)+".xlsx");
+
+//        ParameterizedType type = (ParameterizedType) data.getClass().getGenericSuperclass();
+//        Class dataClass = (Class) type.getActualTypeArguments()[0];
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), dataClass).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet sheet1 = EasyExcel.writerSheet("sheet1").build();
+        excelWriter.write(data, sheet1);
+        excelWriter.finish();
+    }
+}

src/main/java/com/huiju/estateagents/controller/TsActivityDailyController.java

@@ -0,0 +1,105 @@
+package com.huiju.estateagents.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.ExcelUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.excel.ActivityDailyExport;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.huiju.estateagents.service.ITsActivityDailyService;
+import com.huiju.estateagents.entity.TsActivityDaily;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * <p>
+    * 活动统计  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+@RestController
+@RequestMapping("/api/admin/stats")
+public class TsActivityDailyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TsActivityDailyController.class);
+
+    @Autowired
+    public ITsActivityDailyService iTsActivityDailyService;
+
+    @GetMapping("/activity/detail")
+    public ResponseBean getActivityDetail(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          // startDate 默认格式 YYYY-MM-DD
+                                          @RequestParam(value ="startDate", required = false) String startDate,
+                                          @RequestParam(value ="endDate", required = false) String endDate,
+                                          @RequestParam(value ="buildingId", required = false) String buildingId,
+                                          @RequestParam(value ="targetType", required = false) String targetType,
+                                          @RequestParam(value ="targetId", required = false) String targetId,
+                                          @RequestParam(value ="targetName", required = false) String targetName,
+                                          @RequestParam(value ="asc", required = false) String asc,
+                                          @RequestParam(value ="desc", required = false) String desc,
+                                          HttpServletRequest request) {
+
+        if (null == startDate || "".equals(startDate)) {
+            return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (null == endDate || "".equals(endDate)) {
+            endDate = DateUtils.today();
+        }
+
+        Integer orgId = getOrgId(request);
+
+//        IPage<TsActivityDaily> page = new Page<>(pageNum, pageSize);
+//        IPage<TsActivityDaily> result = iTsActivityDailyService.getActivityDetail(page, orgId, startDate, endDate, buildingId, targetType, targetId, targetName, StringUtils.humpToLine(asc), StringUtils.humpToLine(desc));
+        List<TsActivityDaily>  result = iTsActivityDailyService.getActivityDetail(orgId, startDate, endDate, buildingId, targetType, targetId, targetName, StringUtils.humpToLine(asc), StringUtils.humpToLine(desc));
+
+        return ResponseBean.success(result);
+    }
+
+    @PostMapping("/activity/detail")
+    public ResponseBean getActivityDetail(// startDate 默认格式 YYYY-MM-DD
+                                          @RequestParam(value ="startDate", required = false) String startDate,
+                                          @RequestParam(value ="endDate", required = false) String endDate,
+                                          @RequestParam(value ="buildingId", required = false) String buildingId,
+                                          @RequestParam(value ="targetType", required = false) String targetType,
+                                          @RequestParam(value ="targetId", required = false) String targetId,
+                                          @RequestParam(value ="targetName", required = false) String targetName,
+                                          HttpServletRequest request,
+                                          HttpServletResponse response) {
+
+        if (null == startDate || "".equals(startDate)) {
+            return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (null == endDate || "".equals(endDate)) {
+            endDate = DateUtils.today();
+        }
+        if (null == targetType || "".equals(targetType) || null == targetId || "".equals(targetId)) {
+            return ResponseBean.error("活动类型或者ID 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        List<ActivityDailyExport> result = iTsActivityDailyService.getActivityExport(orgId, startDate, endDate, buildingId, targetType, targetId);
+
+        try {
+            ExcelUtils.flush(response, ActivityDailyExport.class, result, StringUtils.strToUnicode(targetName + "活动统计"));
+        } catch (IOException e) {
+//            e.printStackTrace();
+            return ResponseBean.error("导出Excel出错, 请重试 : " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return null;
+    }
+
+}

src/main/java/com/huiju/estateagents/controller/TsConsultantKpiController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.ExcelUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.excel.ConsultantKPIExport;
@@ -116,19 +117,13 @@ public class TsConsultantKpiController extends BaseController {
 
         Integer orgId = getOrgId(request);
         try {
-            response.setContentType("application/octet-stream");
-            response.setCharacterEncoding("utf-8");
-            response.setHeader("Content-disposition", "attachment;filename="+StringUtils.strToUnicode("置业顾问KPI统计")+DateUtils.today()+".xlsx");
 
             // 汇总明细
             List<ConsultantKPIExport> result = iTsConsultantKpiService.stsKPIDailyExport(orgId, buildingId, startDate, endDate);
-            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ConsultantKPIExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
-            WriteSheet sheet1 = EasyExcel.writerSheet("sheet1").build();
-            excelWriter.write(result, sheet1);
-            excelWriter.finish();
+            ExcelUtils.flush(response, ConsultantKPIExport.class, result, "置业顾问KPI统计" + DateUtils.today());
         } catch (Exception e){
 //            e.printStackTrace();
-            return ResponseBean.error("查询出错, 请重试 : " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("导出Excel出错, 请重试 : " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
 
         return null;
@@ -429,16 +424,16 @@ public class TsConsultantKpiController extends BaseController {
      */
     @GetMapping("/consultant/share/times")
     public ResponseBean getConsultantShareTimes(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                  @RequestParam(value ="buildingId", required = false) String buildingId,
-                                                  @RequestParam(value ="userId") String userId,
-                                                  @RequestParam(value ="startDate", required = false) String startDate,
-                                                  @RequestParam(value ="endDate", required = false) String endDate,
-                                                  @RequestParam(value ="targetType", required = false) String targetType,
-                                                  @RequestParam(value ="targetName", required = false) String targetName,
+                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                @RequestParam(value ="userId") String userId,
+                                                @RequestParam(value ="startDate", required = false) String startDate,
+                                                @RequestParam(value ="endDate", required = false) String endDate,
+                                                @RequestParam(value ="targetType", required = false) String targetType,
+                                                @RequestParam(value ="targetName", required = false) String targetName,
                                                 @RequestParam(value ="userName", required = false) String userName,
                                                 @RequestParam(value ="personId", required = false) String personId,
-                                                  HttpServletRequest request) {
+                                                HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {
             dateRange = getLocalTimeRangeBy(startDate, endDate);

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -316,15 +316,18 @@ public class TaPerson implements Serializable {
     /**
      * 访问内容类型
      */
+    @TableField(exist = false)
     private String targetType;
 
     /**
      * 访问内容ID
      */
+    @TableField(exist = false)
     private String targetId;
 
     /**
      * 访问内容名称
      */
+    @TableField(exist = false)
     private String targetName;
 }

src/main/java/com/huiju/estateagents/entity/TsActivityDaily.java

@@ -0,0 +1,97 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 活动统计 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TsActivityDaily implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 统计时间
+     */
+    private String statisDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 活动类型
+     */
+    private String targetType;
+
+    /**
+     * 活动ID
+     */
+    private String targetId;
+
+    /**
+     * 活动名称
+     */
+    private String targetName;
+
+    /**
+     * 分享次数
+     */
+    private Integer shareNum;
+
+    /**
+     * 分享人数
+     */
+    private Integer sharePersons;
+
+    /**
+     * 访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 访问人数
+     */
+    private Integer visitPersons;
+
+    /**
+     * 新增用户
+     */
+    private Integer newPersons;
+
+    /**
+     * 新增客户
+     */
+    private Integer newCustomers;
+
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityDailyExport.java

@@ -0,0 +1,48 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class ActivityDailyExport {
+
+    /**
+     * 统计时间
+     */
+    @ExcelProperty(value = "日期", index = 1)
+    private String statisDate;
+
+
+    @ExcelProperty(value = "分享标题", index = 0)
+    private String targetName;
+
+    /**
+     * 分享次数
+     */
+    @ExcelProperty(value = "分享次数", index = 3)
+    private Integer shareNum;
+
+    /**
+     * 分享人数
+     */
+    @ExcelProperty(value = "分享人数", index = 2)
+    private Integer sharePersons;
+
+    /**
+     * 访问次数
+     */
+    @ExcelProperty(value = "访问次数", index = 5)
+    private Integer visitNum;
+
+    /**
+     * 访问人数
+     */
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer visitPersons;
+
+    /**
+     * 新增客户
+     */
+    @ExcelProperty(value = "新增注册用户", index = 6)
+    private Integer newCustomers;
+}

src/main/java/com/huiju/estateagents/mapper/TsActivityDailyMapper.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TsActivityDaily;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.excel.ActivityDailyExport;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 活动统计  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+@Mapper
+public interface TsActivityDailyMapper extends BaseMapper<TsActivityDaily> {
+
+    /**
+     * 按天汇总活动统计信息
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param targetType
+     * @param targetId
+     * @param targetName
+     * @param asc
+     * @param desc
+     * @return
+     */
+    List<TsActivityDaily> getActivityDetail(@Param("orgId") Integer orgId,
+                                             @Param("startDate") String startDate,
+                                             @Param("endDate") String endDate,
+                                             @Param("buildingId") String buildingId,
+                                             @Param("targetType") String targetType,
+                                             @Param("targetId") String targetId,
+                                             @Param("targetName") String targetName,
+                                             @Param("asc") String asc,
+                                             @Param("desc") String desc);
+
+    /**
+     * 活动统计详情导出
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param targetType
+     * @param targetIdd
+     * @return
+     */
+    List<ActivityDailyExport> getActivityExport(@Param("orgId") Integer orgId,
+                                                @Param("startDate") String startDate,
+                                                @Param("endDate") String endDate,
+                                                @Param("buildingId") String buildingId,
+                                                @Param("targetType") String targetType,
+                                                @Param("targetId") String targetIdd);
+
+
+}

src/main/java/com/huiju/estateagents/service/ITsActivityDailyService.java

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TsActivityDaily;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.excel.ActivityDailyExport;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 活动统计  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+public interface ITsActivityDailyService extends IService<TsActivityDaily> {
+
+    List<TsActivityDaily> getActivityDetail(Integer orgId, String startDate, String endDate, String buildingId, String targetType, String targetId, String targetName, String asc, String desc);
+
+    List<ActivityDailyExport> getActivityExport(Integer orgId, String startDate, String endDate, String buildingId, String targetType, String targetId);
+}

src/main/java/com/huiju/estateagents/service/impl/TsActivityDailyServiceImpl.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TsActivityDaily;
+import com.huiju.estateagents.excel.ActivityDailyExport;
+import com.huiju.estateagents.mapper.TsActivityDailyMapper;
+import com.huiju.estateagents.service.ITsActivityDailyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 活动统计  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+@Service
+public class TsActivityDailyServiceImpl extends ServiceImpl<TsActivityDailyMapper, TsActivityDaily> implements ITsActivityDailyService {
+    @Autowired
+    private TsActivityDailyMapper tsActivityDailyMapper;
+
+    @Override
+    public List<TsActivityDaily> getActivityDetail(Integer orgId, String startDate, String endDate, String buildingId, String targetType, String targetId, String targetName, String asc, String desc) {
+        if (StringUtils.isEmpty(asc) && StringUtils.isEmpty(desc)) {
+            desc = "statis_date";
+        }
+
+        return tsActivityDailyMapper.getActivityDetail(orgId, startDate, endDate, buildingId, targetType, targetId, targetName, asc, desc);
+    }
+
+    @Override
+    public List<ActivityDailyExport> getActivityExport(Integer orgId, String startDate, String endDate, String buildingId, String targetType, String targetId) {
+        return tsActivityDailyMapper.getActivityExport(orgId, startDate, endDate, buildingId, targetType, targetId);
+    }
+}

src/main/resources/mapper/TsActivityDailyMapper.xml

@@ -0,0 +1,74 @@
+<?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.huiju.estateagents.mapper.TsActivityDailyMapper">
+
+    <select id="getActivityDetail" resultType="com.huiju.estateagents.entity.TsActivityDaily">
+        SELECT
+            t.statis_date,
+            SUM(t.share_num) as share_num,
+            SUM(t.share_persons) as share_persons,
+            SUM(t.visit_num) as visit_num,
+            SUM(t.visit_persons) as visit_persons,
+            SUM(t.new_persons) as new_persons,
+            SUM(t.new_customers) as new_customers
+        FROM
+            ts_activity_daily t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+
+        <if test="buildingId != null and buildingId != ''">
+            AND t.building_id = #{buildingId}
+        </if>
+
+        <if test="targetType != null and targetType != ''">
+            AND t.target_type = #{targetType}
+        </if>
+
+        <if test="targetId != null and targetId != ''">
+            AND t.target_id = #{targetId}
+        </if>
+
+        <if test="targetName != null and targetName != ''">
+            AND t.target_name like CONCAT('%', #{targetName}, '%')
+        </if>
+
+        GROUP BY t.statis_date
+
+        <if test="asc != null and asc != ''">
+            ORDER BY ${asc} ASC
+        </if>
+        <if test="desc != null and desc != ''">
+            ORDER BY ${desc} DESC
+        </if>
+    </select>
+
+    <select id="getActivityExport" resultType="com.huiju.estateagents.excel.ActivityDailyExport">
+        SELECT
+            t.statis_date,
+            t.target_type,
+            t.target_id,
+            t.target_name,
+            SUM(t.share_num) as share_num,
+            SUM(t.share_persons) as share_persons,
+            SUM(t.visit_num) as visit_num,
+            SUM(t.visit_persons) as visit_persons,
+            SUM(t.new_persons) as new_persons,
+            SUM(t.new_customers) as new_customers
+        FROM
+            ts_activity_daily t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+
+        <if test="buildingId != null and buildingId != ''">
+            AND t.building_id = #{buildingId}
+        </if>
+
+        AND t.target_type = #{targetType}
+        AND t.target_id = #{targetId}
+
+        GROUP BY t.statis_date, t.target_type, t.target_id
+        ORDER BY t.statis_date DESC
+    </select>
+</mapper>

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -326,14 +326,15 @@
         <!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
         <if test="targetType == null or targetType ==''">
             AND (
-            e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share' )
+            e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
             OR ( e.target_type = 'share' AND e.target_id = 'index' )
             )
         </if>
         <if test="targetType != null and targetType !=''">
-            AND e.target_type = 'share'
+            AND e.target_type = #{targetType}
         </if>
         <if test="targetType != null and targetType =='share'">
+            AND e.target_type = 'share'
             AND e.target_id = 'index'
         </if>