feats

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

@@ -2,10 +2,13 @@ package com.yunzhi.demo.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.deploy.net.HttpResponse;
 import com.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.ExcelUtils;
 import com.yunzhi.demo.common.ResponseBean;
 import com.yunzhi.demo.entity.TaPost;
 import com.yunzhi.demo.service.*;
+import com.yunzhi.demo.vo.ExportStatisPerson;
 import com.yunzhi.demo.vo.StatisPerson;
 import com.yunzhi.demo.vo.StatisPost;
 import io.swagger.annotations.Api;
@@ -16,6 +19,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
@@ -108,4 +113,15 @@ public class StatisticController extends BaseController {
 
         return ResponseBean.success(personList);
     }
+
+    @GetMapping("/admin/export/statis/student-data")
+    @ApiOperation(value="学生统计", notes = "学生统计", httpMethod = "GET", response = ResponseBean.class)
+    public void exportPersonData(@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,
+                                 HttpServletResponse response) throws IOException {
+        List<ExportStatisPerson> personList = iTaStudentService.exportStudentStatis(name, schoolId, specialtyId);
+
+        ExcelUtils.flush(response, ExportStatisPerson.class, personList, "阅读统计");
+    }
 }

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

@@ -1,8 +1,14 @@
 package com.yunzhi.demo.controller;
 
 import com.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
+import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.entity.TaPerson;
+import com.yunzhi.demo.entity.TaPersonData;
 import com.yunzhi.demo.service.*;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,4 +33,25 @@ public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService iTaPersonService;
 
+    @Autowired
+    ITaPersonDataService iTaPersonDataService;
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/person/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="查询用户详情", notes = "查询用户详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taPersonDataGet(@ApiParam("用户ID") @PathVariable String id) throws Exception{
+        TaPerson taPerson = iTaPersonService.getById(id);
+
+        if (null == taPerson || Constants.STATUS_DELETED.equals(taPerson.getStatus())) {
+            throw new Exception("未找到人员信息");
+        }
+
+        TaPersonData taPersonData = iTaPersonDataService.getById(id);
+        taPerson.setPersonData(taPersonData);
+
+        return ResponseBean.success(taPerson);
+    }
 }

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

@@ -46,16 +46,14 @@ public class TaPointsLogController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPointsLog",method= RequestMethod.GET)
+    @RequestMapping(value="/admin/points-log",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taPointsLogList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+                                        @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                        @ApiParam("人员ID") @RequestParam(value ="personId") String personId) throws Exception{
 
 		    IPage<TaPointsLog> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPointsLog> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaPointsLog> result = iTaPointsLogService.page(pg, queryWrapper);
+            IPage<TaPointsLog> result = iTaPointsLogService.getPointsListBy(pg, personId);
             return ResponseBean.success(result);
     }
 

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

@@ -8,6 +8,8 @@ import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
 import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.entity.TaPost;
+import com.yunzhi.demo.service.ITaPersonDataService;
+import com.yunzhi.demo.service.ITaPostDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -44,6 +46,12 @@ public class TaPostSaveController extends BaseController {
     @Autowired
     public ITaPostSaveService iTaPostSaveService;
 
+    @Autowired
+    public ITaPostDataService iTaPostDataService;
+
+    @Autowired
+    public ITaPersonDataService iTaPersonDataService;
+
 
     /**
      * 分页查询列表
@@ -51,15 +59,20 @@ public class TaPostSaveController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/ma/post-save",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/post-save",method= RequestMethod.GET)
     @ApiOperation(value="我的收藏", notes = "小程序我的收藏列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPostSaveList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+    public ResponseBean taPostSaveList(@ApiParam(value = "客户端", allowableValues = "ma,admin") @PathVariable String client,
+                                       @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                       @ApiParam("人员ID") @RequestParam(required = false) String personId) throws Exception {
 
         IPage<TaPost> pg = new Page<>(pageNum, pageSize);
-        TaPerson taPerson = getCurrentPerson();
+        if ("ma".equals(client)) {
+            TaPerson taPerson = getCurrentPerson();
+            personId = taPerson.getPersonId();
+        }
 
-        IPage<TaPost> result = iTaPostSaveService.getMyPostSaveList(pg, taPerson.getPersonId());
+        IPage<TaPost> result = iTaPostSaveService.getMyPostSaveList(pg, personId);
         return ResponseBean.success(result);
     }
 
@@ -83,6 +96,12 @@ public class TaPostSaveController extends BaseController {
         }
 
         if (iTaPostSaveService.save(taPostSave)){
+
+            // 更新文章收藏
+            iTaPostDataService.updateSaveData(postId);
+            // 更新人员收藏
+            iTaPersonDataService.updateSaveData(taPerson.getPersonId());
+
             return ResponseBean.success(taPostSave);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -107,6 +126,12 @@ public class TaPostSaveController extends BaseController {
         taPostSave.setUpdateDate(LocalDateTime.now());
 
         if(iTaPostSaveService.updateById(taPostSave)){
+
+            // 更新文章收藏
+            iTaPostDataService.subSaveData(postId);
+            // 更新人员收藏
+            iTaPersonDataService.subSaveData(taPerson.getPersonId());
+
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("取消我的收藏失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);

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

@@ -85,13 +85,13 @@ public class TaPostTestController extends BaseController {
         }
 
         if (!allRight) {
-            return ResponseBean.error("答题失败", ResponseBean.ERROR_UNAVAILABLE, postTestList);
+            return ResponseBean.error("部分题目作答错误, 请再接再厉!", ResponseBean.ERROR_UNAVAILABLE, postTestList);
         }
 
         // 奖励积分
         iTaPointsLogService.sendPoints(taPost, getCurrentPerson());
 
-        return ResponseBean.success("答题全对");
+        return ResponseBean.success("恭喜你，全部作答正确！");
     }
 
 

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

@@ -42,7 +42,6 @@ public class TaReadLogController extends BaseController {
     @Autowired
     public ITaReadLogService iTaReadLogService;
 
-
     /**
      * 分页查询列表
      * @param pageNum
@@ -59,6 +58,22 @@ public class TaReadLogController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/read-log",method= RequestMethod.GET)
+    @ApiOperation(value="我的阅读记录", notes = "我的阅读记录", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean getReadLogList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @ApiParam("人员ID") @RequestParam("personId") String personId) throws Exception{
+        IPage<TaReadLog> pg = new Page<>(pageNum, pageSize);
+        IPage<TaReadLog> result = iTaReadLogService.getReadList(pg, personId);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param taReadLog 实体对象

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

@@ -148,6 +148,9 @@ public class TaStudentController extends BaseController {
             throw new Exception("验证人员信息失败, 请退出重试");
         }
 
+        TaPersonData taPersonData = iTaPersonDataService.getById(taPerson.getPersonId());
+        taPerson.setPersonData(taPersonData);
+
         // 先找映射ID的
         TaStudent taStudent = iTaStudentService.getByPersonId(taPerson.getPersonId());
         if (null == taStudent) {

src/main/java/com/yunzhi/demo/entity/TaPersonData.java

@@ -41,5 +41,6 @@ public class TaPersonData implements Serializable {
     @ApiModelProperty(value = "阅读文章")
     private Integer readedNum;
 
-
+    @ApiModelProperty(value = "学习文章")
+    private Integer studiedNum;
 }

src/main/java/com/yunzhi/demo/entity/TaPointsLog.java

@@ -1,6 +1,7 @@
 package com.yunzhi.demo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -48,6 +49,10 @@ public class TaPointsLog implements Serializable {
     @ApiModelProperty(value = "资源ID")
     private String targetId;
 
+    @ApiModelProperty("资源标题")
+    @TableField(exist = false)
+    private String targetName;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

src/main/java/com/yunzhi/demo/entity/TaPost.java

@@ -91,6 +91,10 @@ public class TaPost implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateDate;
 
+    @ApiModelProperty(value = "收藏时间")
+    @TableField(exist = false)
+    private LocalDateTime savedDate;
+
     @ApiModelProperty(value = "统计数据")
     @TableField(exist = false)
     private TaPostData postData;

src/main/java/com/yunzhi/demo/entity/TaPostSave.java

@@ -1,6 +1,7 @@
 package com.yunzhi.demo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -36,6 +37,10 @@ public class TaPostSave implements Serializable {
     @ApiModelProperty(value = "文章ID")
     private String postId;
 
+    @ApiModelProperty(value = "文章标题")
+    @TableField(exist = false)
+    private String postName;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

src/main/java/com/yunzhi/demo/entity/TaReadLog.java

@@ -1,6 +1,7 @@
 package com.yunzhi.demo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -36,12 +37,19 @@ public class TaReadLog implements Serializable {
     @ApiModelProperty(value = "文章ID")
     private String postId;
 
+    @ApiModelProperty(value = "文章名称")
+    @TableField(exist = false)
+    private String postName;
+
     @ApiModelProperty(value = "标准时长 单位秒")
     private Integer requireTimes;
 
     @ApiModelProperty(value = "时长 单位秒")
     private Integer duration;
 
+    @ApiModelProperty(value = "是否学习完毕")
+    private Boolean isStudied;
+
     @ApiModelProperty(value = "状态")
     private Integer status;
 

src/main/java/com/yunzhi/demo/entity/TaStudent.java

@@ -1,5 +1,6 @@
 package com.yunzhi.demo.entity;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -36,12 +37,14 @@ public class TaStudent implements Serializable {
     private String personId;
 
     @ApiModelProperty(value = "姓名")
+    @ExcelProperty(value = "姓名", index = 1)
     private String name;
 
     @ApiModelProperty(value = "性别")
     private Integer sex;
 
     @ApiModelProperty(value = "手机")
+    @ExcelProperty(value = "手机", index = 2)
     private String phone;
 
     @ApiModelProperty(value = "邮箱")
@@ -51,6 +54,7 @@ public class TaStudent implements Serializable {
     private String schoolId;
 
     @ApiModelProperty(value = "学校名称")
+    @ExcelProperty(value = "学校名称", index = 0)
     @TableField(exist = false)
     private String schoolName;
 

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

@@ -16,4 +16,8 @@ import org.apache.ibatis.annotations.Mapper;
 public interface TaPersonDataMapper extends BaseMapper<TaPersonData> {
 
     int updatePoints(String personId, Integer points, String creditNum);
+
+    int increaseProp(String personId, String prop);
+
+    int subSaveData(String personId);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.demo.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaPointsLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -15,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaPointsLogMapper extends BaseMapper<TaPointsLog> {
 
+    IPage<TaPointsLog> getPointsListBy(IPage<TaPointsLog> pg, String personId);
 }

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

@@ -22,5 +22,9 @@ public interface TaPostDataMapper extends BaseMapper<TaPostData> {
 
     Map<String, Object> getIndexBasicData();
 
-    List<Map<String, Integer>> getIndexPostPV(String startDate, String endDate);
+    int updatePostSaveData(String postId);
+
+    int subSaveData(String postId);
+
+//    List<Map<String, Integer>> getIndexPostPV(String startDate, String endDate);
 }

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

@@ -20,7 +20,7 @@ import java.util.Map;
 @Mapper
 public interface TaReadLogMapper extends BaseMapper<TaReadLog> {
 
-    int countBy(String personId, String postId);
+    TaReadLog getReadBy(String personId, String postId);
 
     IPage<MyReadLog> getMyReadList(IPage<MyReadLog> pg, String personId);
 
@@ -29,4 +29,8 @@ public interface TaReadLogMapper extends BaseMapper<TaReadLog> {
     List<Map<String, Integer>> getIndexPostPV(String startDate, String endDate, long days);
 
     List<Map<String, Integer>> getIndexPostUV(String startDate, String endDate, long days);
+
+    IPage<TaReadLog> getPersonReadList(IPage<TaReadLog> pg, String personId);
+
+    int updatePersonStudied(String personId, String postId);
 }

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

@@ -3,10 +3,13 @@ package com.yunzhi.demo.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaStudent;
+import com.yunzhi.demo.vo.ExportStatisPerson;
 import com.yunzhi.demo.vo.StatisPerson;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 人员 Mapper 接口
@@ -31,4 +34,6 @@ public interface TaStudentMapper extends BaseMapper<TaStudent> {
                                           @Param("specialtyId") String specialtyId,
                                           @Param("phone") String phone,
                                           @Param("studentNo") String studentNo);
+
+    List<ExportStatisPerson> exportStudentStatis(@Param("name") String name, @Param("schoolId") String schoolId, @Param("specialtyId") String specialtyId);
 }

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

@@ -13,4 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPersonDataService extends IService<TaPersonData> {
 
+    int updateSaveData(String personId);
+
+    int subSaveData(String personId);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.demo.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.entity.TaPointsLog;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -16,4 +17,6 @@ import com.yunzhi.demo.entity.TaPost;
 public interface ITaPointsLogService extends IService<TaPointsLog> {
 
     void sendPoints(TaPost taPost, TaPerson taPerson);
+
+    IPage<TaPointsLog> getPointsListBy(IPage<TaPointsLog> pg, String personId);
 }

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

@@ -20,4 +20,8 @@ public interface ITaPostDataService extends IService<TaPostData> {
     void recordBy(String postId, TaPerson taPerson);
 
     Map<String, Object> getIndexBasicData();
+
+    int updateSaveData(String postId);
+
+    int subSaveData(String postId);
 }

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

@@ -25,4 +25,6 @@ int
     List<Map<String, Integer>> getIndexPostPV(String startDate, String endDate);
 
     List<Map<String, Integer>> getIndexPostUV(String startDate, String endDate);
+
+    IPage<TaReadLog> getReadList(IPage<TaReadLog> pg, String personId);
 }

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

@@ -3,8 +3,11 @@ package com.yunzhi.demo.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.demo.entity.TaStudent;
+import com.yunzhi.demo.vo.ExportStatisPerson;
 import com.yunzhi.demo.vo.StatisPerson;
 
+import java.util.List;
+
 /**
  * <p>
  * 人员 服务类
@@ -25,4 +28,6 @@ public interface ITaStudentService extends IService<TaStudent> {
     TaStudent getByPersonId(String personId);
 
     TaStudent getByPhone(String phone);
+
+    List<ExportStatisPerson> exportStudentStatis(String name, String schoolId, String specialtyId);
 }

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

@@ -4,6 +4,7 @@ import com.yunzhi.demo.entity.TaPersonData;
 import com.yunzhi.demo.mapper.TaPersonDataMapper;
 import com.yunzhi.demo.service.ITaPersonDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +18,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPersonDataServiceImpl extends ServiceImpl<TaPersonDataMapper, TaPersonData> implements ITaPersonDataService {
 
+    @Autowired
+    TaPersonDataMapper taPersonDataMapper;
+
+    @Override
+    public int updateSaveData(String personId) {
+        return taPersonDataMapper.increaseProp(personId, "saved_num");
+    }
+
+    @Override
+    public int subSaveData(String personId) {
+        return taPersonDataMapper.subSaveData(personId);
+    }
 }

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

@@ -1,6 +1,7 @@
 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.SysConfig;
@@ -10,6 +11,7 @@ import com.yunzhi.demo.entity.TaPost;
 import com.yunzhi.demo.mapper.SysConfigMapper;
 import com.yunzhi.demo.mapper.TaPersonDataMapper;
 import com.yunzhi.demo.mapper.TaPointsLogMapper;
+import com.yunzhi.demo.mapper.TaReadLogMapper;
 import com.yunzhi.demo.service.ITaPointsLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +37,12 @@ public class TaPointsLogServiceImpl extends ServiceImpl<TaPointsLogMapper, TaPoi
     @Autowired
     SysConfigMapper sysConfigMapper;
 
+    @Autowired
+    TaPointsLogMapper taPointsLogMapper;
+
+    @Autowired
+    TaReadLogMapper taReadLogMapper;
+
     @Async
     @Override
     public void sendPoints(TaPost taPost, TaPerson taPerson) {
@@ -56,7 +64,7 @@ public class TaPointsLogServiceImpl extends ServiceImpl<TaPointsLogMapper, TaPoi
 
         // 查询积分-学分转换规则
         String ratio = sysConfigMapper.getValueOf(Constants.SYS_PARAM_POINT_CREDIT_RATIO);
-        String creditNum = points.toString();
+        Integer creditNum = new Double(points / Double.parseDouble(ratio)).intValue();
 
         taPointsLog = new TaPointsLog();
         taPointsLog.setPersonId(taPerson.getPersonId());
@@ -64,13 +72,16 @@ public class TaPointsLogServiceImpl extends ServiceImpl<TaPointsLogMapper, TaPoi
         taPointsLog.setTargetId(taPost.getPostId());
         taPointsLog.setPointsNum(points);
         taPointsLog.setRatio(ratio);
-        taPointsLog.setCreditNum(creditNum);
+        taPointsLog.setCreditNum(creditNum.toString());
 
         try {
             save(taPointsLog);
 
             // 累计入账户
-            taPersonDataMapper.updatePoints(taPerson.getPersonId(), points, creditNum);
+            taPersonDataMapper.updatePoints(taPerson.getPersonId(), points, creditNum.toString());
+
+            // 更新阅读完成标志
+            taReadLogMapper.updatePersonStudied(taPerson.getPersonId(), taPost.getPostId());
         } catch (Exception e) {
             e.printStackTrace();
 
@@ -84,6 +95,11 @@ public class TaPointsLogServiceImpl extends ServiceImpl<TaPointsLogMapper, TaPoi
         }
     }
 
+    @Override
+    public IPage<TaPointsLog> getPointsListBy(IPage<TaPointsLog> pg, String personId) {
+        return taPointsLogMapper.getPointsListBy(pg, personId);
+    }
+
     private TaPointsLog getByPersonPost(String personId, String targetId) {
         QueryWrapper<TaPointsLog> queryWrapper = new QueryWrapper<TaPointsLog>()
                 .eq("person_id", personId)

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

@@ -3,8 +3,10 @@ package com.yunzhi.demo.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.entity.TaPerson;
+import com.yunzhi.demo.entity.TaPersonData;
 import com.yunzhi.demo.entity.TaPostData;
 import com.yunzhi.demo.entity.TaReadLog;
+import com.yunzhi.demo.mapper.TaPersonDataMapper;
 import com.yunzhi.demo.mapper.TaPostDataMapper;
 import com.yunzhi.demo.mapper.TaReadLogMapper;
 import com.yunzhi.demo.service.ITaPostDataService;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -33,24 +36,37 @@ public class TaPostDataServiceImpl extends ServiceImpl<TaPostDataMapper, TaPostD
     @Autowired
     TaReadLogMapper taReadLogMapper;
 
+    @Autowired
+    TaPersonDataMapper taPersonDataMapper;
+
     @Async
     @Override
     public void recordBy(String postId, TaPerson taPerson) {
         // 先查询当前人员以前有没有阅读过
-        int cnt = taReadLogMapper.countBy(taPerson.getPersonId(), postId);
+        TaReadLog taReadLog = taReadLogMapper.getReadBy(taPerson.getPersonId(), postId);
+        boolean readed = null != taReadLog;
 
         int addPv = 1;
-        int addUv = cnt > 0 ? 0 : 1;
+        int addUv = readed ? 0 : 1;
 
+        // 更新人员的数据
+        if (!readed) {
+            taPersonDataMapper.increaseProp(taPerson.getPersonId(), "readed_num");
+        }
+
+        // 更新当前文章的数据
         taPostDataMapper.updatePvUvBy(postId, addUv, addPv);
 
         // 如果当前人员以前未读过
-        if (cnt == 0) {
-            TaReadLog taReadLog = new TaReadLog();
+        if (!readed) {
+            taReadLog = new TaReadLog();
             taReadLog.setPostId(postId);
             taReadLog.setPersonId(taPerson.getPersonId());
             taReadLog.setStatus(Constants.READ_READY);
             taReadLogMapper.insert(taReadLog);
+        } else {
+            taReadLog.setUpdateDate(LocalDateTime.now());
+            taReadLogMapper.updateById(taReadLog);
         }
     }
 
@@ -58,4 +74,14 @@ public class TaPostDataServiceImpl extends ServiceImpl<TaPostDataMapper, TaPostD
     public Map<String, Object> getIndexBasicData() {
         return taPostDataMapper.getIndexBasicData();
     }
+
+    @Override
+    public int updateSaveData(String postId) {
+        return taPostDataMapper.updatePostSaveData(postId);
+    }
+
+    @Override
+    public int subSaveData(String postId) {
+        return taPostDataMapper.subSaveData(postId);
+    }
 }

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

@@ -53,4 +53,10 @@ public class TaReadLogServiceImpl extends ServiceImpl<TaReadLogMapper, TaReadLog
         long days = DateUtils.daysBetween(dt1, dt2);
         return taReadLogMapper.getIndexPostUV(startDate, endDate, days);
     }
+
+    @Override
+    public IPage<TaReadLog> getReadList(IPage<TaReadLog> pg, String personId) {
+        return taReadLogMapper.getPersonReadList(pg, personId);
+    }
+
 }

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

@@ -8,10 +8,13 @@ import com.yunzhi.demo.common.StringUtils;
 import com.yunzhi.demo.entity.TaStudent;
 import com.yunzhi.demo.mapper.TaStudentMapper;
 import com.yunzhi.demo.service.ITaStudentService;
+import com.yunzhi.demo.vo.ExportStatisPerson;
 import com.yunzhi.demo.vo.StatisPerson;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 人员 服务实现类
@@ -71,6 +74,11 @@ public class TaStudentServiceImpl extends ServiceImpl<TaStudentMapper, TaStudent
         return getOne(queryWrapper);
     }
 
+    @Override
+    public List<ExportStatisPerson> exportStudentStatis(String name, String schoolId, String specialtyId) {
+        return taStudentMapper.exportStudentStatis(name, schoolId, specialtyId);
+    }
+
     private String getDBFieldBy(String name) {
         if (StringUtils.isEmpty(name)) {
             return null;

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

@@ -0,0 +1,28 @@
+package com.yunzhi.demo.vo;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class ExportStatisPerson {
+    @ExcelProperty(value = "姓名", index = 1)
+    private String name;
+
+    @ExcelProperty(value = "手机", index = 2)
+    private String phone;
+
+    @ExcelProperty(value = "学校名称", index = 0)
+    private String schoolName;
+
+    @ExcelProperty(value = "积分", index = 5)
+    private Integer pointNum;
+
+    @ExcelProperty(value = "学分", index = 6)
+    private String creditNum;
+
+    @ExcelProperty(value = "收藏文章", index = 3)
+    private Integer savedNum;
+
+    @ExcelProperty(value = "阅读文章", index = 4)
+    private Integer readedNum;
+}

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

@@ -1,5 +1,6 @@
 package com.yunzhi.demo.vo;
 
+import com.alibaba.excel.annotation.ExcelProperty;
 import com.yunzhi.demo.entity.TaStudent;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,14 +11,18 @@ import lombok.Data;
 public class StatisPerson extends TaStudent {
 
     @ApiModelProperty(value = "积分")
+    @ExcelProperty(value = "积分", index = 5)
     private Integer pointNum;
 
     @ApiModelProperty(value = "学分")
+    @ExcelProperty(value = "学分", index = 6)
     private String creditNum;
 
     @ApiModelProperty(value = "收藏文章")
+    @ExcelProperty(value = "收藏文章", index = 3)
     private Integer savedNum;
 
     @ApiModelProperty(value = "阅读文章")
+    @ExcelProperty(value = "阅读文章", index = 4)
     private Integer readedNum;
 }

src/main/resources/mapper/TaPersonDataMapper.xml

@@ -9,4 +9,16 @@
         WHERE
             person_id = #{personId}
     </update>
+    <update id="increaseProp">
+        UPDATE ta_person_data
+        SET ${prop} = ${prop} + 1
+        WHERE
+            person_id = #{personId}
+    </update>
+    <update id="subSaveData">
+        UPDATE ta_person_data
+        SET saved_num = saved_num - 1
+        WHERE
+            person_id = #{personId}
+    </update>
 </mapper>

src/main/resources/mapper/TaPointsLogMapper.xml

@@ -2,4 +2,18 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.TaPointsLogMapper">
 
+    <select id="getPointsListBy" resultType="com.yunzhi.demo.entity.TaPointsLog">
+        SELECT
+            t.*,
+            s.`name` AS target_name
+        FROM
+            ta_points_log t
+                LEFT JOIN ta_post s ON t.target_id = s.post_id
+        WHERE
+            t.target_type = 'post'
+          AND t.person_id = #{personId}
+          AND t.`status` = 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaPostDataMapper.xml

@@ -9,6 +9,18 @@
         WHERE
             post_id = #{postId}
     </update>
+    <update id="updatePostSaveData">
+        UPDATE ta_post_data
+        SET saved_num = saved_num + 1
+        WHERE
+            post_id = #{postId}
+    </update>
+    <update id="subSaveData">
+        UPDATE ta_post_data
+        SET saved_num = saved_num - 1
+        WHERE
+            post_id = #{postId}
+    </update>
     <select id="getIndexBasicData" resultType="java.util.Map">
         SELECT
             count( 1 ) AS total,

src/main/resources/mapper/TaPostSaveMapper.xml

@@ -4,7 +4,8 @@
 
     <select id="getMyPostSaveList" resultType="com.yunzhi.demo.entity.TaPost">
         SELECT
-            s.*
+            s.*,
+            t.create_date as saved_date
         FROM
             ta_post_save t
                 INNER JOIN ta_post s ON t.post_id = s.post_id

src/main/resources/mapper/TaReadLogMapper.xml

@@ -9,15 +9,23 @@
             person_id = #{personId}
           AND post_id = #{postId}
     </update>
+    <update id="updatePersonStudied">
+        UPDATE ta_read_log
+        SET is_studied = 1
+        WHERE
+            person_id = #{personId}
+          AND post_id = #{postId}
+    </update>
 
-    <select id="countBy" resultType="java.lang.Integer">
+    <select id="getReadBy" resultType="com.yunzhi.demo.entity.TaReadLog">
         SELECT
-            count( * )
+            t.*
         FROM
             ta_read_log t
         WHERE
             t.person_id = #{personId}
           AND t.post_id = #{postId}
+          AND t.status = 1
     </select>
     <select id="getMyReadList" resultType="com.yunzhi.demo.entity.MyReadLog">
         SELECT
@@ -80,4 +88,18 @@
         ORDER BY
             t.rownum ASC
     </select>
+    <select id="getPersonReadList" resultType="com.yunzhi.demo.entity.TaReadLog">
+
+        SELECT
+            t.*,
+            s.name as post_name
+        FROM
+            ta_read_log t
+            LEFT JOIN ta_post s ON t.post_id = s.post_id
+        WHERE
+            t.person_id = #{personId}
+          AND t.status = 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaStudentMapper.xml

@@ -60,4 +60,30 @@
         ORDER BY
             t.create_date DESC
     </select>
+    <select id="exportStudentStatis" resultType="com.yunzhi.demo.vo.ExportStatisPerson">
+        SELECT
+            m.name as school_name,
+            t.name,
+            t.phone,
+            s.credit_num,
+            s.point_num,
+            s.readed_num,
+            s.saved_num
+        FROM
+        ta_student t
+        INNER JOIN ta_person_data s ON t.person_id = s.person_id
+        LEFT JOIN td_school m ON t.school_id = m.school_id
+        WHERE 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
+            t.school_id DESC, s.readed_num DESC
+    </select>
 </mapper>