feats

src/main/java/com/yunzhi/demo/common/DateUtils.java

+package com.yunzhi.demo.common;
+
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+
+public class DateUtils {
+    public static LocalDateTime from(String str, String formater) {
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern(formater);
+        return LocalDateTime.parse(str, fmt);
+    }
+
+    public static long daysBetween(LocalDateTime dt1, LocalDateTime dt2) {
+        Duration duration = Duration.between(dt1, dt2);
+        return duration.toDays();
+    }
+}

src/main/java/com/yunzhi/demo/controller/StatisticController.java

 package com.yunzhi.demo.controller;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.demo.common.BaseController;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.entity.TaPost;
 import com.yunzhi.demo.service.ITaPersonService;
 import com.yunzhi.demo.service.ITaPostDataService;
+import com.yunzhi.demo.service.ITaPostService;
+import com.yunzhi.demo.service.ITaReadLogService;
+import com.yunzhi.demo.vo.StatisPerson;
+import com.yunzhi.demo.vo.StatisPost;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 
     @Autowired
     ITaPersonService iTaPersonService;
 
+    @Autowired
+    ITaReadLogService iTaReadLogService;
+
+    @Autowired
+    ITaPostService iTaPostService;
+
 
     @GetMapping("/admin/index/post-data")
     @ApiOperation(value="首页简单的几个统计", notes = "首页简单的几个统计", httpMethod = "GET", response = ResponseBean.class)
 
         return ResponseBean.success(result);
     }
+
+    /**
+     * 首页科普浏览统计
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @GetMapping("/admin/index/post-pv")
+    @ApiOperation(value="首页科普浏览统计", notes = "首页科普浏览统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getIndexPostPV(@ApiParam(value = "开始日期", example="YYYY-MM-DD") @RequestParam("startDate") String startDate,
+                                       @ApiParam(value = "结束日期", example="YYYY-MM-DD") @RequestParam("endDate") String endDate) {
+        List<Map<String, Integer>> result = iTaReadLogService.getIndexPostPV(startDate, endDate);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 首页学生浏览统计
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @GetMapping("/admin/index/post-uv")
+    public ResponseBean getIndexPostUV(@ApiParam(value = "开始日期", example="YYYY-MM-DD") @RequestParam("startDate") String startDate,
+                                       @ApiParam(value = "结束日期", example="YYYY-MM-DD") @RequestParam("endDate") String endDate) {
+        List<Map<String, Integer>> result = iTaReadLogService.getIndexPostUV(startDate, endDate);
+        return ResponseBean.success(result);
+    }
+
+    @GetMapping("/admin/statis/post-data")
+    @ApiOperation(value="科普统计", notes = "科普统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getPostData(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                    @ApiParam(value = "开始日期", example="YYYY-MM-DD") @RequestParam(value = "startDate", required = false) String startDate,
+                                    @ApiParam(value = "结束日期", example="YYYY-MM-DD") @RequestParam(value = "endDate", required = false) String endDate,
+                                    @ApiParam(value = "科普分类") @RequestParam(value = "name", required = false) String name,
+                                    @ApiParam(value = "科普分类") @RequestParam(value = "typeId", required = false) String typeId,
+                                    @ApiParam("升序") @RequestParam(value = "asc", required = false) String asc,
+                                    @ApiParam("降序") @RequestParam(value = "desc", required = false) String desc) {
+        IPage<StatisPost> pg = new Page<>(pageNum, pageSize);
+
+        IPage<StatisPost> postList = iTaPostService.getPostStatis(pg, startDate, endDate, name, typeId, asc, desc);
+
+        return ResponseBean.success(postList);
+    }
+
+    @GetMapping("/admin/statis/student-data")
+    @ApiOperation(value="学生统计", notes = "学生统计", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getPersonData(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @ApiParam(value = "姓名") @RequestParam(value = "name", required = false) String name,
+                                      @ApiParam(value = "学校") @RequestParam(value = "schoolId", required = false) String schoolId,
+                                      @ApiParam(value = "专业") @RequestParam(value = "specialtyId", required = false) String specialtyId,
+                                      @ApiParam("升序") @RequestParam(value = "asc", required = false) String asc,
+                                      @ApiParam("降序") @RequestParam(value = "desc", required = false) String desc) {
+        IPage<StatisPerson> pg = new Page<>(pageNum, pageSize);
+
+        IPage<StatisPerson> personList = iTaPersonService.getStudentStatis(pg, name, schoolId, specialtyId, asc, desc);
+
+        return ResponseBean.success(personList);
+    }
 }

src/main/java/com/yunzhi/demo/mapper/TaPersonMapper.java

 package com.yunzhi.demo.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaPerson;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.demo.vo.StatisPerson;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {
 
+    IPage<StatisPerson> getStudentStatis(IPage<StatisPerson> pg,
+                                        @Param("name") String name,
+                                        @Param("schoolId") String schoolId,
+                                        @Param("specialtyId") String specialtyId,
+                                        @Param("asc") String asc,
+                                        @Param("desc") String desc);
 }

src/main/java/com/yunzhi/demo/mapper/TaPostDataMapper.java

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
     int updatePvUvBy(String postId, int addUv, int addPv);
 
     Map<String, Object> getIndexBasicData();
+
+    List<Map<String, Integer>> getIndexPostPV(String startDate, String endDate);
 }

src/main/java/com/yunzhi/demo/mapper/TaPostMapper.java

 package com.yunzhi.demo.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaPost;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.demo.vo.StatisPost;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
 @Mapper
 public interface TaPostMapper extends BaseMapper<TaPost> {
 
+    IPage<StatisPost> getPostStatis(IPage<StatisPost> pg,
+                                    @Param("startDate") String startDate,
+                                    @Param("endDate") String endDate,
+                                    @Param("name") String name,
+                                    @Param("typeId") String typeId,
+                                    @Param("asc") String asc,
+                                    @Param("desc") String desc);
 }

src/main/java/com/yunzhi/demo/mapper/TaReadLogMapper.java

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 阅读记录 Mapper 接口
     IPage<MyReadLog> getMyReadList(IPage<MyReadLog> pg, String personId);
 
     int updateDuration(String personId, String postId, Integer duration);
+
+    List<Map<String, Integer>> getIndexPostPV(String startDate, String endDate, long days);
+
+    List<Map<String, Integer>> getIndexPostUV(String startDate, String endDate, long days);
 }

src/main/java/com/yunzhi/demo/service/ITaPersonService.java

 package com.yunzhi.demo.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaPerson;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.demo.vo.StatisPerson;
 
 /**
  * <p>
     TaPerson getByOpenid(String openid);
 
     int countStudent();
+
+    IPage<StatisPerson> getStudentStatis(IPage<StatisPerson> pg, String name, String schoolId, String specialtyId, String asc, String desc);
 }

src/main/java/com/yunzhi/demo/service/ITaPostDataService.java

 import com.yunzhi.demo.entity.TaPostData;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
 import java.util.Map;
 
 /**

src/main/java/com/yunzhi/demo/service/ITaPostService.java

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaPost;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.demo.vo.StatisPost;
 
 /**
  * <p>
 public interface ITaPostService extends IService<TaPost> {
 
     IPage<TaPost> getIndexList(IPage<TaPost> page);
+
+    IPage<StatisPost> getPostStatis(IPage<StatisPost> pg, String startDate, String endDate, String name, String typeId, String asc, String desc);
 }

src/main/java/com/yunzhi/demo/service/ITaReadLogService.java

 import com.yunzhi.demo.entity.TaReadLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 阅读记录 服务类
     IPage<MyReadLog> getMyReadList(IPage<MyReadLog> pg, String personId);
 int
      updateDuration(String personId, String postId, Integer duration);
+
+    List<Map<String, Integer>> getIndexPostPV(String startDate, String endDate);
+
+    List<Map<String, Integer>> getIndexPostUV(String startDate, String endDate);
 }

src/main/java/com/yunzhi/demo/service/impl/TaPersonServiceImpl.java

 package com.yunzhi.demo.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.common.Constants;
+import com.yunzhi.demo.common.StringUtils;
 import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.mapper.TaPersonMapper;
 import com.yunzhi.demo.service.ITaPersonService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.demo.vo.StatisPerson;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
 @Service
 public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
+    @Autowired
+    TaPersonMapper taPersonMapper;
+
     @Override
     public TaPerson getByOpenid(String openid) {
         QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
                 .gt("status", Constants.STATUS_DELETED);
         return count(queryWrapper);
     }
+
+    @Override
+    public IPage<StatisPerson> getStudentStatis(IPage<StatisPerson> pg, String name, String schoolId, String specialtyId, String asc, String desc) {
+        if (StringUtils.isEmpty(asc) && StringUtils.isEmpty(desc)) {
+            desc = "readedNum";
+        }
+        return taPersonMapper.getStudentStatis(pg, name, schoolId, specialtyId, getDBFieldBy(asc), getDBFieldBy(desc));
+    }
+
+    private String getDBFieldBy(String name) {
+        if (StringUtils.isEmpty(name)) {
+            return null;
+        }
+
+        switch (name.toLowerCase()) {
+            case "readedNum":
+                return "readed_num";
+            case "creditNum":
+                return "credit_num";
+            case "pointNum":
+                return "point_num";
+            default:
+                return "saved_num";
+        }
+    }
 }

src/main/java/com/yunzhi/demo/service/impl/TaPostDataServiceImpl.java

 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
 import java.util.Map;
 
 /**

src/main/java/com/yunzhi/demo/service/impl/TaPostServiceImpl.java

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.common.Constants;
+import com.yunzhi.demo.common.StringUtils;
 import com.yunzhi.demo.entity.TaPost;
 import com.yunzhi.demo.mapper.TaPostMapper;
 import com.yunzhi.demo.service.ITaPostService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.demo.vo.StatisPost;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Locale;
+
 /**
  * <p>
  * 文章表 服务实现类
 @Service
 public class TaPostServiceImpl extends ServiceImpl<TaPostMapper, TaPost> implements ITaPostService {
 
+    @Autowired
+    TaPostMapper taPostMapper;
+
     @Override
     public IPage<TaPost> getIndexList(IPage<TaPost> page) {
         QueryWrapper<TaPost> queryWrapper = new QueryWrapper<TaPost>()
                 .orderByDesc("create_date");
         return page(page, queryWrapper);
     }
+
+    @Override
+    public IPage<StatisPost> getPostStatis(IPage<StatisPost> pg, String startDate, String endDate, String name, String typeId, String asc, String desc) {
+        if (StringUtils.isEmpty(asc) && StringUtils.isEmpty(desc)) {
+            desc = "pv";
+        }
+        return taPostMapper.getPostStatis(pg, startDate, endDate, name, typeId, getDBFieldBy(asc), getDBFieldBy(desc));
+    }
+
+    private String getDBFieldBy(String name) {
+        if (StringUtils.isEmpty(name)) {
+            return null;
+        }
+
+        switch (name.toLowerCase()) {
+            case "uv":
+                return "u_v";
+            case "pv":
+                return "p_v";
+            default:
+                return "saved_num";
+        }
+    }
+
 }

src/main/java/com/yunzhi/demo/service/impl/TaReadLogServiceImpl.java

 package com.yunzhi.demo.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.demo.common.DateUtils;
 import com.yunzhi.demo.entity.MyReadLog;
 import com.yunzhi.demo.entity.TaReadLog;
 import com.yunzhi.demo.mapper.TaReadLogMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 阅读记录 服务实现类
     public int updateDuration(String personId, String postId, Integer duration) {
         return taReadLogMapper.updateDuration(personId, postId, duration);
     }
+
+    @Override
+    public List<Map<String, Integer>> getIndexPostPV(String startDate, String endDate) {
+        LocalDateTime dt1 = DateUtils.from(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        LocalDateTime dt2 = DateUtils.from(endDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        long days = DateUtils.daysBetween(dt1, dt2);
+        return taReadLogMapper.getIndexPostPV(startDate, endDate, days);
+    }
+
+    @Override
+    public List<Map<String, Integer>> getIndexPostUV(String startDate, String endDate) {
+        LocalDateTime dt1 = DateUtils.from(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        LocalDateTime dt2 = DateUtils.from(endDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+        long days = DateUtils.daysBetween(dt1, dt2);
+        return taReadLogMapper.getIndexPostUV(startDate, endDate, days);
+    }
 }

src/main/java/com/yunzhi/demo/vo/StatisPerson.java

+package com.yunzhi.demo.vo;
+
+import com.yunzhi.demo.entity.TaPerson;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "学生统计")
+@Data
+public class StatisPerson extends TaPerson {
+
+    @ApiModelProperty(value = "积分")
+    private Integer pointNum;
+
+    @ApiModelProperty(value = "学分")
+    private String creditNum;
+
+    @ApiModelProperty(value = "收藏文章")
+    private Integer savedNum;
+
+    @ApiModelProperty(value = "阅读文章")
+    private Integer readedNum;
+}

src/main/java/com/yunzhi/demo/vo/StatisPost.java

+package com.yunzhi.demo.vo;
+
+import com.yunzhi.demo.entity.TaPost;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(description = "科普统计")
+@Data
+public class StatisPost extends TaPost {
+
+    @ApiModelProperty(value = "阅读人数")
+    private Long uV;
+
+    @ApiModelProperty(value = "浏览量")
+    private Long pV;
+
+    @ApiModelProperty(value = "收藏量")
+    private Long savedNum;
+}

src/main/resources/mapper/TaPersonMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.TaPersonMapper">
 
+    <select id="getStudentStatis" resultType="com.yunzhi.demo.vo.StatisPerson">
+        SELECT
+            t.*,
+            s.credit_num,
+            s.point_num,
+            s.readed_num,
+            s.saved_num
+        FROM
+            ta_person t
+                INNER JOIN ta_person_data s ON t.person_id = s.person_id
+        WHERE
+            t.student_id > ''
+          AND t.`status` > - 1
+        <if test="name != null and name != ''">
+            AND t.`name` LIKE CONCAT('%', #{name}, '%')
+        </if>
+        <if test="schoolId != null and schoolId != ''">
+            AND t.school_id = #{schoolId}
+        </if>
+        <if test="specialtyId != null and specialtyId != ''">
+          AND t.specialty_id = #{specialtyId}
+        </if>
+        ORDER BY
+        <if test="asc != null and asc != ''">
+            ${asc} ASC
+        </if>
+        <if test="desc != null and desc != ''">
+            ${desc} DESC
+        </if>
+    </select>
 </mapper>

src/main/resources/mapper/TaPostMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.TaPostMapper">
 
+    <select id="getPostStatis" resultType="com.yunzhi.demo.vo.StatisPost">
+        SELECT
+            *
+        FROM
+            (
+            SELECT
+                t.*,
+                sum( IF ( s.serial_no IS NULL, 0, 1 ) ) AS p_v,
+                count( DISTINCT s.person_id ) AS u_v,
+                sum( IF ( m.serial_no IS NULL, 0, 1 ) ) AS saved_num
+            FROM
+                ta_post t
+                LEFT JOIN ta_read_log s ON t.post_id = s.post_id
+                LEFT JOIN ta_post_save m ON t.post_id = m.post_id
+                AND m.`status` > - 1
+            WHERE
+                1 = 1
+              <if test="startDate != null and startDate != ''">
+                  AND s.create_date &gt;= DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
+                  AND m.create_date &gt;= DATE_FORMAT( #{startDate}, '%Y-%m-%d' )
+              </if>
+              <if test="startDate != null and startDate != ''">
+                  AND s.create_date &lt;= DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
+                  AND m.create_date &lt;= DATE_FORMAT( #{endDate}, '%Y-%m-%d' )
+              </if>
+              <if test="typeId != null and typeId != ''">
+                  AND t.type_id = #{typeId}
+              </if>
+              <if test="name != null and name != ''">
+                AND t.name LIKE CONCAT('%', #{name}, '%')
+              </if>
+            GROUP BY
+                t.post_id
+            ) a
+        ORDER BY
+          <if test="asc != null and asc != ''">
+            ${asc} ASC
+          </if>
+          <if test="desc != null and desc != ''">
+            ${desc} DESC
+          </if>
+    </select>
 </mapper>

src/main/resources/mapper/TaReadLogMapper.xml

         ORDER BY
             t.create_date DESC
     </select>
+    <select id="getIndexPostPV" resultType="java.util.Map">
+        SELECT
+            date_add( STR_TO_DATE( #{startDate}, '%Y-%m-%d' ), INTERVAL t.rownum DAY ) AS dt,
+            IFNULL( s.val, 0 ) AS val
+        FROM
+            sequence t
+            LEFT JOIN (
+                SELECT
+                    count( 1 ) AS val,
+                    DATE_FORMAT( create_date, '%Y-%m-%d' ) AS dt
+                FROM
+                    ta_read_log
+                WHERE
+                    DATE_FORMAT( create_date, '%Y-%m-%d' ) BETWEEN #{startDate} AND #{endDate}
+                GROUP BY
+                    DATE_FORMAT( create_date, '%Y-%m-%d' )
+            ) s ON t.rownum = to_days( s.dt ) - to_days( #{startDate} )
+        WHERE
+            t.rownum &lt; #{days}
+        ORDER BY
+            t.rownum ASC
+    </select>
+    <select id="getIndexPostUV" resultType="java.util.Map">
+
+        SELECT
+            date_add( STR_TO_DATE( #{startDate}, '%Y-%m-%d' ), INTERVAL t.rownum DAY ) AS dt,
+            IFNULL( s.val, 0 ) AS val
+        FROM
+            sequence t
+                LEFT JOIN (
+                SELECT
+                    count( DISTINCT person_id ) AS val,
+                    DATE_FORMAT( create_date, '%Y-%m-%d' ) AS dt
+                FROM
+                    ta_read_log
+                WHERE
+                    DATE_FORMAT( create_date, '%Y-%m-%d' ) BETWEEN #{startDate} AND #{endDate}
+                GROUP BY
+                    DATE_FORMAT( create_date, '%Y-%m-%d' )
+            ) s ON t.rownum = to_days( s.dt ) - to_days( #{startDate} )
+        WHERE
+            t.rownum &lt; #{days}
+        ORDER BY
+            t.rownum ASC
+    </select>
 </mapper>