feats

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

@@ -1,7 +1,15 @@
 package com.yunzhi.demo.common;
 
 public class Constants {
+    // 基本状态
     public final static Integer STATUS_DELETED = -1;
     public final static Integer STATUS_READY = 0;
     public final static Integer STATUS_NORMAL = 1;
+
+    // 阅读状态
+    public final static Integer READ_READY = 0;
+    public final static Integer READ_FINISHED = 1;
+
+    // 资源类型
+    public final static String RESOURCE_TYPE_POST = "post"; // 科普文章
 }

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

@@ -4,21 +4,18 @@ 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.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.entity.TaPerson;
 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;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.demo.service.ITaMedicalLogService;
 import com.yunzhi.demo.entity.TaMedicalLog;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -39,6 +36,22 @@ public class TaMedicalLogController extends BaseController {
     @Autowired
     public ITaMedicalLogService iTaMedicalLogService;
 
+    @GetMapping("/ma/medical-log")
+    @ApiOperation(value="我的就诊记录", notes = "我的就诊记录", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean maMedicalList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+        TaPerson taPerson = getCurrentPerson();
+
+        IPage<TaMedicalLog> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaMedicalLog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("person_id", taPerson.getPersonId());
+        queryWrapper.eq("status", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaMedicalLog> result = iTaMedicalLogService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
 
     /**
      * 分页查询列表
@@ -111,9 +124,10 @@ public class TaMedicalLogController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taMedicalLog/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taMedicalLogGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+    @RequestMapping(value="/{client}/medical-log/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="就诊详情", notes = "就诊详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taMedicalLogGet(@ApiParam(value = "客户端", allowableValues = "admin,ma") @PathVariable String client,
+                                        @ApiParam("就诊ID") @PathVariable Integer id) throws Exception{
         return ResponseBean.success(iTaMedicalLogService.getById(id));
     }
 }

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

@@ -4,10 +4,13 @@ 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.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.common.StringUtils;
 import com.yunzhi.demo.entity.TaPersonData;
-import com.yunzhi.demo.service.ITaPersonDataService;
-import com.yunzhi.demo.service.ITaPostDataService;
+import com.yunzhi.demo.entity.TdSchool;
+import com.yunzhi.demo.entity.TdSpecialty;
+import com.yunzhi.demo.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -15,9 +18,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.yunzhi.demo.service.ITaPersonService;
 import com.yunzhi.demo.entity.TaPerson;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -43,68 +46,89 @@ public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonDataService iTaPersonDataService;
 
+    @Autowired
+    ITdSchoolService iTdSchoolService;
+
+    @Autowired
+    ITdSpecialtyService iTdSpecialtyService;
+
     /**
      * 分页查询列表
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPerson",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @RequestMapping(value="/admin/person",method= RequestMethod.GET)
+    @ApiOperation(value="查询学生列表", notes = "查询学生列表", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taPersonList(@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("名称") @RequestParam(value ="name", required = false) String name,
+                                     @ApiParam("学校ID") @RequestParam(value ="schoolId", required = false) String schoolId,
+                                     @ApiParam("专业ID") @RequestParam(value ="specialtyId", required = false) String specialtyId,
+                                     @ApiParam("手机") @RequestParam(value ="phone", required = false) String phone,
+                                     @ApiParam("学号") @RequestParam(value ="studentId", required = false) String studentId) throws Exception{
 
 		    IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
+                    .gt("status", Constants.STATUS_DELETED)
+                    .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
+                    .eq(!StringUtils.isEmpty(schoolId), "school_id", schoolId)
+                    .eq(!StringUtils.isEmpty(specialtyId), "specialty_id", specialtyId)
+                    .like(!StringUtils.isEmpty(phone), "phone", "%"+phone+"%")
+                    .like(!StringUtils.isEmpty(studentId), "student_id", "%"+studentId+"%")
+                    .orderByDesc("create_date");
 
             IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
             return ResponseBean.success(result);
     }
 
+//    /**
+//     * 保存对象
+//     * @param taPerson 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taPerson",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taPersonAdd(@ApiParam("保存内容") @RequestBody TaPerson taPerson) throws Exception{
+//
+//        if (iTaPersonService.save(taPerson)){
+//            return ResponseBean.success(taPerson);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
+//    /**
+//     * 根据id删除对象
+//     * @param id  实体ID
+//     */
+//    @RequestMapping(value="/taPerson/{id}", method= RequestMethod.DELETE)
+//    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+//    public ResponseBean taPersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+//        if(iTaPersonService.removeById(id)){
+//            return ResponseBean.success("success");
+//        }else {
+//            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
     /**
-     * 保存对象
+     * 小程序完善信息
      * @param taPerson 实体对象
      * @return
      */
-    @RequestMapping(value="/taPerson",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taPersonAdd(@ApiParam("保存内容") @RequestBody TaPerson taPerson) throws Exception{
-
-        if (iTaPersonService.save(taPerson)){
-            return ResponseBean.success(taPerson);
-        }else {
-            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id删除对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/taPerson/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taPersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaPersonService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    @RequestMapping(value="/ma/person",method= RequestMethod.PUT)
+    @ApiOperation(value="小程序完善信息", notes = "更新当前人自己的信息", httpMethod = "PUT", response = TaPerson.class)
+    public ResponseBean taPersonUpdate(@ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
+        TaPerson currentPerson = getCurrentPerson();
+        if (null == currentPerson || null == taPerson || !currentPerson.getPersonId().equals(taPerson.getPersonId())) {
+            throw new Exception("校验人员信息失败");
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taPerson 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taPersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
+        taPerson.setUpdateDate(LocalDateTime.now());
 
         if (iTaPersonService.updateById(taPerson)){
-            return ResponseBean.success(iTaPersonService.getById(id));
+            return ResponseBean.success(iTaPersonService.getById(taPerson.getPersonId()));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -114,28 +138,48 @@ public class TaPersonController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaPersonService.getById(id));
+    @RequestMapping(value="/admin/person/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="学生详情", notes = "查询人员详细信息", httpMethod = "GET", response = TaPerson.class)
+    public ResponseBean taPersonGet(@ApiParam("学生ID") @PathVariable String id) throws Exception{
+        TaPerson taPerson = iTaPersonService.getById(id);
+        if (null == taPerson || Constants.STATUS_DELETED.equals(taPerson.getStatus())) {
+            throw new Exception("验证人员信息失败, 请退出重试");
+        }
+
+        fillInfo(taPerson);
+
+        return ResponseBean.success(taPerson);
     }
 
     @GetMapping("/ma/currentPerson")
-    @ApiOperation(value="获取当前人员信息", notes = "获取当前人员信息", httpMethod = "GET", response = TaPerson.class)
+    @ApiOperation(value="小程序当前人员", notes = "获取当前人员信息", httpMethod = "GET", response = TaPerson.class)
     public ResponseBean getCurrent() throws Exception {
-        Map<String, Object> result = new HashMap<>();
-
         TaPerson taPerson = getCurrentPerson();
         if (null == taPerson) {
             throw new Exception("验证人员信息失败, 请退出重试");
         }
 
-        // 获取统计数据
-        TaPersonData taPersonData = iTaPersonDataService.getById(taPerson.getPersonId());
+        fillInfo(taPerson);
+
+        return ResponseBean.success(taPerson);
+    }
 
-        result.put("person", taPerson);
-        result.put("personData", taPersonData);
+    private void fillInfo(TaPerson taPerson) {
+        // 冗余学校名称, 专业名称
+        if (null != taPerson.getSchoolId()) {
+            TdSchool tdSchool = iTdSchoolService.getById(taPerson.getSchoolId());
+            if (null != tdSchool) {
+                taPerson.setSchoolName(tdSchool.getName());
+            }
+
+            TdSpecialty tdSpecialty = iTdSpecialtyService.getById(taPerson.getSpecialtyId());
+            if (null != tdSpecialty) {
+                taPerson.setSpecialtyName(tdSpecialty.getName());
+            }
+        }
 
-        return ResponseBean.success(taPersonData);
+        // 获取统计数据
+        TaPersonData taPersonData = iTaPersonDataService.getById(taPerson.getPersonId());
+        taPerson.setPersonData(taPersonData);
     }
 }

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

@@ -4,7 +4,10 @@ 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.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.TaPost;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,6 +23,8 @@ import com.yunzhi.demo.service.ITaPostSaveService;
 import com.yunzhi.demo.entity.TaPostSave;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.time.LocalDateTime;
+
 /**
  * <p>
     * 收藏 前端控制器
@@ -46,27 +51,36 @@ public class TaPostSaveController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taPostSave",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @RequestMapping(value="/ma/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{
+                                       @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
-		    IPage<TaPostSave> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPostSave> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaPost> pg = new Page<>(pageNum, pageSize);
+        TaPerson taPerson = getCurrentPerson();
 
-            IPage<TaPostSave> result = iTaPostSaveService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        IPage<TaPost> result = iTaPostSaveService.getMyPostSaveList(pg, taPerson.getPersonId());
+        return ResponseBean.success(result);
     }
 
     /**
-     * 保存对象
-     * @param taPostSave 实体对象
+     * 添加收藏
+     * @param postId 文章ID
      * @return
      */
-    @RequestMapping(value="/taPostSave",method= RequestMethod.POST)
-    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taPostSaveAdd(@ApiParam("保存内容") @RequestBody TaPostSave taPostSave) throws Exception{
+    @RequestMapping(value="/ma/post-save",method= RequestMethod.POST)
+    @ApiOperation(value="添加我的收藏", notes = "添加我的收藏", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taPostSaveAdd(@ApiParam("文章ID") @RequestParam String postId) throws Exception{
+        TaPerson taPerson = getCurrentPerson();
+        TaPostSave taPostSave = new TaPostSave();
+        taPostSave.setPostId(postId);
+        taPostSave.setPersonId(taPerson.getPersonId());
+
+        // 先校验是否存在
+        boolean saved = iTaPostSaveService.checkSaved(taPerson.getPersonId(), postId);
+        if (saved) {
+            return ResponseBean.success("已收藏");
+        }
 
         if (iTaPostSaveService.save(taPostSave)){
             return ResponseBean.success(taPostSave);
@@ -76,37 +90,47 @@ public class TaPostSaveController extends BaseController {
     }
 
     /**
-     * 根据id删除对象
-     * @param id  实体ID
+     * 取消我的收藏
+     * @param postId  文章ID
      */
-    @RequestMapping(value="/taPostSave/{id}", method= RequestMethod.DELETE)
-    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taPostSaveDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaPostSaveService.removeById(id)){
-            return ResponseBean.success("success");
-        }else {
-            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    @RequestMapping(value="/ma/post-save", method= RequestMethod.DELETE)
+    @ApiOperation(value="取消我的收藏", notes = "取消我的收藏", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taPostSaveDelete(@ApiParam("文章ID") @RequestParam String postId) throws Exception{
+        TaPerson taPerson = getCurrentPerson();
+        TaPostSave taPostSave = iTaPostSaveService.getMyPostSave(taPerson.getPersonId(), postId);
+
+        if (null == taPostSave) {
+            return ResponseBean.success("已取消收藏");
         }
-    }
 
-    /**
-     * 修改对象
-     * @param id  实体ID
-     * @param taPostSave 实体对象
-     * @return
-     */
-    @RequestMapping(value="/taPostSave/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taPostSaveUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaPostSave taPostSave) throws Exception{
+        taPostSave.setStatus(Constants.STATUS_DELETED);
+        taPostSave.setUpdateDate(LocalDateTime.now());
 
-        if (iTaPostSaveService.updateById(taPostSave)){
-            return ResponseBean.success(iTaPostSaveService.getById(id));
+        if(iTaPostSaveService.updateById(taPostSave)){
+            return ResponseBean.success("success");
         }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            return ResponseBean.error("取消我的收藏失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
     }
 
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taPostSave 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taPostSave/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taPostSaveUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaPostSave taPostSave) throws Exception{
+//
+//        if (iTaPostSaveService.updateById(taPostSave)){
+//            return ResponseBean.success(iTaPostSaveService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
     /**
      * 根据id查询对象
      * @param id  实体ID

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

@@ -4,21 +4,23 @@ 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.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.common.StringUtils;
+import com.yunzhi.demo.entity.TaPost;
+import com.yunzhi.demo.service.ITaPointsLogService;
+import com.yunzhi.demo.service.ITaPostService;
 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;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.demo.service.ITaPostTestService;
 import com.yunzhi.demo.entity.TaPostTest;
-import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
 
 /**
  * <p>
@@ -37,7 +39,58 @@ public class TaPostTestController extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(TaPostTestController.class);
 
     @Autowired
-    public ITaPostTestService iTaPostTestService;
+    ITaPostTestService iTaPostTestService;
+
+    @Autowired
+    ITaPostService iTaPostService;
+
+    @Autowired
+    ITaPointsLogService iTaPointsLogService;
+
+    @PostMapping("/ma/answer-test")
+    public ResponseBean answerPostTest(@ApiParam("答题内容") @RequestBody List<TaPostTest> postTestList) throws Exception {
+        if (null == postTestList || postTestList.size() == 0) {
+            throw new Exception("未发现答题内容");
+        }
+
+        String postId = postTestList.get(0).getPostId();
+        TaPost taPost = iTaPostService.getById(postId);
+        if (null == taPost || Constants.STATUS_DELETED.equals(taPost.getStatus())) {
+            throw new Exception("答题文章内容不存在");
+        }
+
+        if (null != taPost.getAnswerNum() && taPost.getAnswerNum() > postTestList.size()) {
+            throw new Exception(String.format("当前知识需至少答 %d 题", taPost.getAnswerNum()));
+        }
+
+        boolean allRight = true;
+        for(int i = 0; i < postTestList.size(); i++) {
+            TaPostTest myTest = postTestList.get(i);
+            TaPostTest postTest = iTaPostTestService.getById(myTest.getSerialNo());
+            if (null == postTest || StringUtils.isEmpty(postTest.getCorrectAnswers())) {
+                throw new Exception("部分考题未设置正确答案, 请退出重试");
+            }
+
+            String myAnswer = myTest.getCorrectAnswers();
+            if (StringUtils.isEmpty(myAnswer)) {
+                throw new Exception("部分考题未作答");
+            }
+
+            boolean isRight = iTaPostTestService.checkAnswer(postTest.getCorrectAnswers(), myAnswer);
+            myTest.setIsRight(isRight);
+
+            allRight = allRight && isRight;
+        }
+
+        if (!allRight) {
+            return ResponseBean.error("答题失败", ResponseBean.ERROR_UNAVAILABLE, postTestList);
+        }
+
+        // 奖励积分
+        iTaPointsLogService.sendPoints(taPost, getCurrentPerson());
+
+        return ResponseBean.success("答题全对");
+    }
 
 
     /**

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

@@ -5,6 +5,9 @@ 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.common.StringUtils;
+import com.yunzhi.demo.entity.MyReadLog;
+import com.yunzhi.demo.entity.TaPerson;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -46,17 +49,14 @@ public class TaReadLogController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taReadLog",method= RequestMethod.GET)
-    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    @RequestMapping(value="/ma/read-log",method= RequestMethod.GET)
+    @ApiOperation(value="我的阅读记录", notes = "我的阅读记录", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean taReadLogList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
-
-		    IPage<TaReadLog> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaReadLog> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
-
-            IPage<TaReadLog> result = iTaReadLogService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+        TaPerson taPerson = getCurrentPerson();
+        IPage<MyReadLog> pg = new Page<>(pageNum, pageSize);
+        IPage<MyReadLog> result = iTaReadLogService.getMyReadList(pg, taPerson.getPersonId());
+        return ResponseBean.success(result);
     }
 
     /**
@@ -90,21 +90,21 @@ public class TaReadLogController extends BaseController {
     }
 
     /**
-     * 修改对象
-     * @param id  实体ID
+     * 更新文章阅读时长
      * @param taReadLog 实体对象
      * @return
      */
-    @RequestMapping(value="/taReadLog/{id}",method= RequestMethod.PUT)
-    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taReadLogUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaReadLog taReadLog) throws Exception{
-
-        if (iTaReadLogService.updateById(taReadLog)){
-            return ResponseBean.success(iTaReadLogService.getById(id));
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+    @RequestMapping(value="/ma/read-log",method= RequestMethod.PUT)
+    @ApiOperation(value="更新文章阅读时长", notes = "更新文章阅读时长", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taReadLogUpdate(@ApiParam("更新内容") @RequestBody TaReadLog taReadLog) throws Exception{
+        if (StringUtils.isEmpty(taReadLog.getPostId()) || null == taReadLog.getDuration()) {
+            throw new Exception("未设置更新文章及时长");
         }
+
+        TaPerson taPerson = getCurrentPerson();
+        iTaReadLogService.updateDuration(taPerson.getPersonId(), taReadLog.getPostId(), taReadLog.getDuration());
+
+        return ResponseBean.success("更新成功");
     }
 
     /**

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

@@ -4,21 +4,18 @@ 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.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.common.StringUtils;
 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;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.demo.service.ITdSchoolService;
 import com.yunzhi.demo.entity.TdSchool;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -39,6 +36,17 @@ public class TdSchoolController extends BaseController {
     @Autowired
     public ITdSchoolService iTdSchoolService;
 
+    @GetMapping("/ma/school")
+    @ApiOperation(value="小程序学校字典", notes = "学校列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean maSchoolList(@ApiParam(value = "名称", required = false) @RequestParam(value ="name", required = false) String name) throws Exception {
+        QueryWrapper<TdSchool> queryWrapper = new QueryWrapper<TdSchool>()
+                .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
+                .eq("status", Constants.STATUS_NORMAL)
+                .orderByAsc("sort_no")
+                .orderByDesc("create_date");
+
+        return ResponseBean.success(iTdSchoolService.list(queryWrapper));
+    }
 
     /**
      * 分页查询列表

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

@@ -4,21 +4,18 @@ 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.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.common.StringUtils;
 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;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.demo.service.ITdSpecialtyService;
 import com.yunzhi.demo.entity.TdSpecialty;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -39,6 +36,19 @@ public class TdSpecialtyController extends BaseController {
     @Autowired
     public ITdSpecialtyService iTdSpecialtyService;
 
+    @GetMapping("/ma/specialty")
+    @ApiOperation(value="小程序学科专业字典", notes = "学科专业", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean maSchoolList(@ApiParam(value = "学校ID", required = false) @RequestParam(value ="school", required = false) String school,
+                                     @ApiParam(value = "名称", required = false) @RequestParam(value ="name", required = false) String name) throws Exception {
+        QueryWrapper<TdSpecialty> queryWrapper = new QueryWrapper<TdSpecialty>()
+                .eq(!StringUtils.isEmpty(school),"schoolId", school)
+                .like(!StringUtils.isEmpty(name), "name", "%"+name+"%")
+                .eq("status", Constants.STATUS_NORMAL)
+                .orderByAsc("sort_no")
+                .orderByDesc("create_date");
+
+        return ResponseBean.success(iTdSpecialtyService.list(queryWrapper));
+    }
 
     /**
      * 分页查询列表

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

@@ -0,0 +1,23 @@
+package com.yunzhi.demo.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="MyReadLog", description="我的阅读记录")
+public class MyReadLog extends TaPost {
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "时长 单位秒")
+    private Integer duration;
+
+    @ApiModelProperty(value = "状态")
+    private Integer readStatus;
+}

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

@@ -2,6 +2,8 @@ package com.yunzhi.demo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
@@ -51,12 +53,23 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "邮箱")
     private String eMail;
 
-    @ApiModelProperty(value = "学校")
-    private String school;
+    @ApiModelProperty(value = "学校ID")
+    private String schoolId;
+
+    @ApiModelProperty(value = "学校名称")
+    @TableField(exist = false)
+    private String schoolName;
 
     @ApiModelProperty(value = "学界")
     private String schoolBatch;
 
+    @ApiModelProperty(value = "专业ID")
+    private String specialtyId;
+
+    @ApiModelProperty(value = "专业名称")
+    @TableField(exist = false)
+    private String specialtyName;
+
     @ApiModelProperty(value = "学号")
     private String studentId;
 
@@ -69,5 +82,7 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateDate;
 
-
+    @ApiModelProperty(value = "统计数据")
+    @TableField(exist = false)
+    private TaPersonData personData;
 }

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

@@ -33,7 +33,7 @@ public class TaPersonData implements Serializable {
     private Integer pointNum;
 
     @ApiModelProperty(value = "学分")
-    private Integer creditNum;
+    private String creditNum;
 
     @ApiModelProperty(value = "收藏文章")
     private Integer savedNum;

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

@@ -37,7 +37,7 @@ public class TaPointsLog implements Serializable {
     private Integer pointsNum;
 
     @ApiModelProperty(value = "学分")
-    private Integer creditNum;
+    private String creditNum;
 
     @ApiModelProperty(value = "兑换比例")
     private String ratio;

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

@@ -64,6 +64,9 @@ public class TaPost implements Serializable {
     @ApiModelProperty(value = "视频地址")
     private String videoUrl;
 
+    @ApiModelProperty(value = "视频封面")
+    private String videoPoster;
+
     @ApiModelProperty(value = "标签组")
     private String tags;
 

src/main/java/com/yunzhi/demo/entity/TaPostTest.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;
@@ -63,5 +64,7 @@ public class TaPostTest implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateDate;
 
-
+    @ApiModelProperty("是否答对")
+    @TableField(exist = false)
+    private Boolean isRight;
 }

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

@@ -26,6 +26,10 @@ public class TaTopic implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
     @ApiModelProperty(value = "对象")
     private String targetType;
 

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

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

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

@@ -1,5 +1,7 @@
 package com.yunzhi.demo.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.demo.entity.TaPost;
 import com.yunzhi.demo.entity.TaPostSave;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaPostSaveMapper extends BaseMapper<TaPostSave> {
 
+    IPage<TaPost> getMyPostSaveList(IPage<TaPost> pg, String personId);
 }

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

@@ -1,5 +1,7 @@
 package com.yunzhi.demo.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.demo.entity.MyReadLog;
 import com.yunzhi.demo.entity.TaReadLog;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -16,4 +18,8 @@ import org.apache.ibatis.annotations.Mapper;
 public interface TaReadLogMapper extends BaseMapper<TaReadLog> {
 
     int countBy(String personId, String postId);
+
+    IPage<MyReadLog> getMyReadList(IPage<MyReadLog> pg, String personId);
+
+    int updateDuration(String personId, String postId, Integer duration);
 }

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

@@ -1,7 +1,9 @@
 package com.yunzhi.demo.service;
 
+import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.entity.TaPointsLog;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.demo.entity.TaPost;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPointsLogService extends IService<TaPointsLog> {
 
+    void sendPoints(TaPost taPost, TaPerson taPerson);
 }

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

@@ -1,5 +1,7 @@
 package com.yunzhi.demo.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.demo.entity.TaPost;
 import com.yunzhi.demo.entity.TaPostSave;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -14,4 +16,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ITaPostSaveService extends IService<TaPostSave> {
 
     boolean checkSaved(String personId, String postId);
+
+    IPage<TaPost> getMyPostSaveList(IPage<TaPost> pg, String personId);
+
+    TaPostSave getMyPostSave(String personId, String postId);
 }

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

@@ -18,4 +18,6 @@ public interface ITaPostTestService extends IService<TaPostTest> {
     List<TaPostTest> getListByPostId(String postId);
 
     TaPostTest getRandRowBy(String postId);
+
+    boolean checkAnswer(String target, String answer);
 }

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

@@ -1,5 +1,7 @@
 package com.yunzhi.demo.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.demo.entity.MyReadLog;
 import com.yunzhi.demo.entity.TaReadLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaReadLogService extends IService<TaReadLog> {
 
+    IPage<MyReadLog> getMyReadList(IPage<MyReadLog> pg, String personId);
+int
+     updateDuration(String personId, String postId, Integer duration);
 }

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

@@ -1,9 +1,18 @@
 package com.yunzhi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.demo.common.Constants;
+import com.yunzhi.demo.common.StringUtils;
+import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.entity.TaPointsLog;
+import com.yunzhi.demo.entity.TaPost;
+import com.yunzhi.demo.mapper.TaPersonDataMapper;
 import com.yunzhi.demo.mapper.TaPointsLogMapper;
 import com.yunzhi.demo.service.ITaPointsLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,7 +23,69 @@ import org.springframework.stereotype.Service;
  * @author yansen
  * @since 2021-04-15
  */
+@Slf4j
 @Service
 public class TaPointsLogServiceImpl extends ServiceImpl<TaPointsLogMapper, TaPointsLog> implements ITaPointsLogService {
 
+    @Autowired
+    TaPersonDataMapper taPersonDataMapper;
+
+    @Async
+    @Override
+    public void sendPoints(TaPost taPost, TaPerson taPerson) {
+        if (null == taPost || null == taPerson) {
+            return;
+        }
+
+        Integer points = taPost.getPoints();
+        if (null == points) {
+            points = 0;
+        }
+
+        // 先验证是否已经获取过积分
+        TaPointsLog taPointsLog = getByPersonPost(taPerson.getPersonId(), taPost.getPostId());
+        if (null != taPointsLog) {
+            // 已经答过该题, 不处理
+            return;
+        }
+
+        // 查询积分-学分转换规则
+        // TODO 此处需要查询系统参数
+        String ratio = "1";
+        String creditNum = points.toString();
+
+        taPointsLog = new TaPointsLog();
+        taPointsLog.setPersonId(taPerson.getPersonId());
+        taPointsLog.setTargetType(Constants.RESOURCE_TYPE_POST);
+        taPointsLog.setTargetId(taPost.getPostId());
+        taPointsLog.setPointsNum(points);
+        taPointsLog.setRatio(ratio);
+        taPointsLog.setCreditNum(creditNum);
+
+        try {
+            save(taPointsLog);
+
+            // 累计入账户
+            taPersonDataMapper.updatePoints(taPerson.getPersonId(), points, creditNum);
+        } catch (Exception e) {
+            e.printStackTrace();
+
+            log.error(String.format("奖励[%s-%s] 阅读[%s-%s] 积分 %d 失败: %s",
+                    StringUtils.ifNull(taPerson.getName(), taPerson.getNickName()),
+                    taPerson.getPersonId(),
+                    taPost.getName(),
+                    taPost.getPostId(),
+                    points,
+                    e.getMessage()));
+        }
+    }
+
+    private TaPointsLog getByPersonPost(String personId, String postId) {
+        QueryWrapper<TaPointsLog> queryWrapper = new QueryWrapper<TaPointsLog>()
+                .eq("person_id", personId)
+                .eq("post_id", postId)
+                .eq("status", Constants.STATUS_NORMAL);
+
+        return getOne(queryWrapper);
+    }
 }

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

@@ -1,6 +1,7 @@
 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.TaPostData;
 import com.yunzhi.demo.entity.TaReadLog;
@@ -45,6 +46,7 @@ public class TaPostDataServiceImpl extends ServiceImpl<TaPostDataMapper, TaPostD
             TaReadLog taReadLog = new TaReadLog();
             taReadLog.setPostId(postId);
             taReadLog.setPersonId(taPerson.getPersonId());
+            taReadLog.setStatus(Constants.READ_READY);
             taReadLogMapper.insert(taReadLog);
         }
     }

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

@@ -1,10 +1,14 @@
 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.entity.TaPost;
 import com.yunzhi.demo.entity.TaPostSave;
 import com.yunzhi.demo.mapper.TaPostSaveMapper;
 import com.yunzhi.demo.service.ITaPostSaveService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,12 +21,28 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class TaPostSaveServiceImpl extends ServiceImpl<TaPostSaveMapper, TaPostSave> implements ITaPostSaveService {
+    @Autowired
+    TaPostSaveMapper taPostSaveMapper;
 
     @Override
     public boolean checkSaved(String personId, String postId) {
-        QueryWrapper<TaPostSave> queryWrapper = new QueryWrapper<TaPostSave>()
+        return count(queryByPersonAndPost(personId, postId)) > 0;
+    }
+
+    @Override
+    public IPage<TaPost> getMyPostSaveList(IPage<TaPost> pg, String personId) {
+        return taPostSaveMapper.getMyPostSaveList(pg, personId);
+    }
+
+    @Override
+    public TaPostSave getMyPostSave(String personId, String postId) {
+        return getOne(queryByPersonAndPost(personId, postId));
+    }
+
+    private QueryWrapper<TaPostSave> queryByPersonAndPost(String personId, String postId) {
+        return new QueryWrapper<TaPostSave>()
                 .eq("person_id", personId)
-                .eq("post_id", postId);
-        return count(queryWrapper) > 0;
+                .eq("post_id", postId)
+                .eq("status", Constants.STATUS_NORMAL);
     }
 }

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

@@ -2,6 +2,7 @@ package com.yunzhi.demo.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.demo.common.Constants;
+import com.yunzhi.demo.common.StringUtils;
 import com.yunzhi.demo.entity.TaPostTest;
 import com.yunzhi.demo.mapper.TaPostTestMapper;
 import com.yunzhi.demo.service.ITaPostTestService;
@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -38,4 +40,21 @@ public class TaPostTestServiceImpl extends ServiceImpl<TaPostTestMapper, TaPostT
     public TaPostTest getRandRowBy(String postId) {
         return taPostTestMapper.getRandRowBy(postId);
     }
+
+    /**
+     * 判断是否答题正确
+     * @param target
+     * @param answer
+     */
+    @Override
+    public boolean checkAnswer(String target, String answer) {
+        List<String> correctAnswers = Arrays.asList(target.split(","));
+        List<String> myAnswers = Arrays.asList(answer.split(","));
+
+        if (correctAnswers.size() != myAnswers.size()) {
+            return false;
+        }
+
+        return myAnswers.containsAll(correctAnswers);
+    }
 }

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

@@ -1,9 +1,12 @@
 package com.yunzhi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.demo.entity.MyReadLog;
 import com.yunzhi.demo.entity.TaReadLog;
 import com.yunzhi.demo.mapper.TaReadLogMapper;
 import com.yunzhi.demo.service.ITaReadLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +20,16 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaReadLogServiceImpl extends ServiceImpl<TaReadLogMapper, TaReadLog> implements ITaReadLogService {
 
+    @Autowired
+    TaReadLogMapper taReadLogMapper;
+
+    @Override
+    public IPage<MyReadLog> getMyReadList(IPage<MyReadLog> pg, String personId) {
+        return taReadLogMapper.getMyReadList(pg, personId);
+    }
+
+    @Override
+    public int updateDuration(String personId, String postId, Integer duration) {
+        return taReadLogMapper.updateDuration(personId, postId, duration);
+    }
 }

src/main/resources/mapper/TaPersonDataMapper.xml

@@ -2,4 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.TaPersonDataMapper">
 
+    <update id="updatePoints">
+        UPDATE ta_person_data
+        SET point_num = point_num + ${points},
+            credit_num = credit_num + ${creditNum}
+        WHERE
+            person_id = #{personId}
+    </update>
 </mapper>

src/main/resources/mapper/TaPostSaveMapper.xml

@@ -2,4 +2,17 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.TaPostSaveMapper">
 
+    <select id="getMyPostSaveList" resultType="com.yunzhi.demo.entity.TaPost">
+        SELECT
+            s.*
+        FROM
+            ta_post_save t
+                INNER JOIN ta_post s ON t.post_id = s.post_id
+        WHERE
+            t.person_id = #{personId}
+          AND t.`status` = 1
+          AND s.`status` > - 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaReadLogMapper.xml

@@ -1,6 +1,14 @@
 <?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.yunzhi.demo.mapper.TaReadLogMapper">
+    <update id="updateDuration">
+        UPDATE ta_read_log
+        SET duration = duration + #{duration},
+            update_date = now()
+        WHERE
+            person_id = #{personId}
+          AND post_id = #{postId}
+    </update>
 
     <select id="countBy" resultType="java.lang.Integer">
         SELECT
@@ -11,4 +19,20 @@
             t.person_id = #{personId}
           AND t.post_id = #{postId}
     </select>
+    <select id="getMyReadList" resultType="com.yunzhi.demo.entity.MyReadLog">
+        SELECT
+            s.*,
+            t.person_id,
+            t.duration,
+            t.`status` AS read_status
+        FROM
+            ta_read_log t
+                INNER JOIN ta_post s ON t.post_id = s.post_id
+        WHERE
+            t.person_id = #{personId}
+          AND t.`status` > - 1
+          AND s.`status` > - 1
+        ORDER BY
+            t.create_date DESC
+    </select>
 </mapper>