feats

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

@@ -1,4 +1,68 @@
 package com.yunzhi.demo.common;
 
+import com.yunzhi.demo.entity.SysUser;
+import com.yunzhi.demo.entity.TaPerson;
+import com.yunzhi.demo.service.ISysUserService;
+import com.yunzhi.demo.service.ITaPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
 public class BaseController {
+
+    @Autowired
+    ISysUserService iSysUserService;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    /**
+     * 获取当前管理端人员
+     * @return
+     */
+    public SysUser getCurrentUser() {
+        Map<String, Object> tokenParam = CurrentContext.getTokenParam();
+        if (null == tokenParam) {
+            return null;
+        }
+
+        if (null != tokenParam.get("miniApp")) {
+            return null;
+        }
+
+        Object userId = tokenParam.get("userId");
+
+        SysUser sysUser = iSysUserService.getById((String) userId);
+        if (Constants.STATUS_DELETED.equals(sysUser.getStatus())) {
+            return null;
+        }
+
+        return sysUser;
+    }
+
+    /**
+     * 获取当前小程序端人员
+     * @return
+     */
+    public TaPerson getCurrentPerson() {
+        Map<String, Object> tokenParam = CurrentContext.getTokenParam();
+        if (null == tokenParam) {
+            return null;
+        }
+
+        if (null == tokenParam.get("miniApp")) {
+            return null;
+        }
+
+        Object personId = tokenParam.get("userId");
+
+        TaPerson taPerson = iTaPersonService.getById((String) personId);
+        if (Constants.STATUS_DELETED.equals(taPerson.getStatus())) {
+            return null;
+        }
+
+        return taPerson;
+    }
 }

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

@@ -1,46 +1,20 @@
 package com.yunzhi.demo.common;
 
-import com.yunzhi.demo.entity.SysUser;
-import com.yunzhi.demo.service.ISysUserService;
-import com.yunzhi.demo.vo.TokenParam;
+import java.util.Map;
 
 public class CurrentContext {
 
     /**
      * TokenParam 相关
      */
-    private static final ThreadLocal<TokenParam> tokenParamHolder = new ThreadLocal<>();
+    private static final ThreadLocal<Map<String, Object>> tokenParamHolder = new ThreadLocal<>();
 
-    public static void setTokenParam(TokenParam tokenParam) {
+    public static void setTokenParam(Map<String, Object> tokenParam) {
         tokenParamHolder.remove();
         tokenParamHolder.set(tokenParam);
     }
 
-    public static TokenParam getTokenParam() {
+    public static Map<String, Object> getTokenParam() {
         return tokenParamHolder.get();
     }
-
-    /**
-     * 获取当前请求用户
-     * @param iSysUserService
-     * @return
-     */
-    public static SysUser getCurrentUser(ISysUserService iSysUserService) {
-        try {
-            TokenParam tokenParam = getTokenParam();
-            if (null == tokenParam) {
-                return null;
-            }
-
-            SysUser sysUser = iSysUserService.getById(tokenParam.getUserId());
-            if (null == sysUser || Constants.STATUS_DELETED.equals(sysUser.getStatus())) {
-                return null;
-            }
-
-            return sysUser;
-        } catch (Exception e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
 }

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

@@ -0,0 +1,60 @@
+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.SysBanner;
+import com.yunzhi.demo.entity.TaPost;
+import com.yunzhi.demo.entity.TaTopic;
+import com.yunzhi.demo.service.ISysBannerService;
+import com.yunzhi.demo.service.ITaPostService;
+import com.yunzhi.demo.service.ITaTopicService;
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "小程序首页")
+@RestController
+@RequestMapping("/ma/index")
+public class MaIndexController extends BaseController {
+
+    @Autowired
+    ISysBannerService iSysBannerService;
+
+    @Autowired
+    ITaTopicService iTaTopicService;
+
+    @Autowired
+    ITaPostService iTaPostService;
+
+    @GetMapping("/banner")
+    @ApiOperation(value="Banner列表", notes = "Banner列表", httpMethod = "GET", response = SysBanner.class)
+    public ResponseBean getBannerList() throws Exception {
+        List<SysBanner> bannerList = iSysBannerService.getIndexList();
+        return ResponseBean.success(bannerList);
+    }
+
+    @GetMapping("/topic")
+    @ApiOperation(value="热门列表", notes = "热门列表", httpMethod = "GET", response = TaTopic.class)
+    public ResponseBean getTopicList() throws Exception {
+        List<TaTopic> topicList = iTaTopicService.getIndexList();
+        return ResponseBean.success(topicList);
+    }
+
+    @GetMapping("/post")
+    @ApiOperation(value="最新文章", notes = "最新文章", httpMethod = "GET", response = TaPost.class)
+    public ResponseBean getPostList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception {
+        IPage<TaPost> page = new Page<>(pageNum, pageSize);
+        IPage<TaPost> postList = iTaPostService.getIndexList(page);
+        return ResponseBean.success(postList);
+    }
+}

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

@@ -135,12 +135,11 @@ public class SysUserController extends BaseController {
 
     /**
      * 当前用户
-     * @param id  实体ID
      */
     @RequestMapping(value="/admin/currentUser",method= RequestMethod.GET)
     @ApiOperation(value="当前用户", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
     public ResponseBean currentUser() throws Exception{
-        SysUser sysUser = CurrentContext.getCurrentUser(iSysUserService);
+        SysUser sysUser = getCurrentUser();
         List<SysMenu> sysMenuList = iSysMenuService.getListWithRoles();
         List<SysUserRole> sysUserRoleList = iSysUserRoleService.getListByUser(sysUser.getUserId());
 

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

@@ -5,20 +5,21 @@ 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.TaPersonData;
+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;
 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.ITaPersonService;
 import com.yunzhi.demo.entity.TaPerson;
-import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * <p>
@@ -37,8 +38,10 @@ public class TaPersonController extends BaseController {
     private final Logger logger = LoggerFactory.getLogger(TaPersonController.class);
 
     @Autowired
-    public ITaPersonService iTaPersonService;
+    ITaPersonService iTaPersonService;
 
+    @Autowired
+    ITaPersonDataService iTaPersonDataService;
 
     /**
      * 分页查询列表
@@ -116,4 +119,23 @@ public class TaPersonController extends BaseController {
     public ResponseBean taPersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
         return ResponseBean.success(iTaPersonService.getById(id));
     }
+
+    @GetMapping("/ma/currentPerson")
+    @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());
+
+        result.put("person", taPerson);
+        result.put("personData", taPersonData);
+
+        return ResponseBean.success(taPersonData);
+    }
 }

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

@@ -7,8 +7,8 @@ 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.TdPostType;
-import com.yunzhi.demo.service.ITdPostTypeService;
+import com.yunzhi.demo.entity.*;
+import com.yunzhi.demo.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,10 +20,13 @@ 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 com.yunzhi.demo.service.ITaPostService;
-import com.yunzhi.demo.entity.TaPost;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
     * 文章表 前端控制器
@@ -46,6 +49,15 @@ public class TaPostController extends BaseController {
     @Autowired
     public ITdPostTypeService iTdPostTypeService;
 
+    @Autowired
+    public ITaPostDataService iTaPostDataService;
+
+    @Autowired
+    public ITaPostTestService iTaPostTestService;
+
+    @Autowired
+    public ITaPostSaveService iTaPostSaveService;
+
 
     /**
      * 分页查询列表
@@ -53,9 +65,10 @@ public class TaPostController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/post",method= RequestMethod.GET)
+    @RequestMapping(value="/{client}/post",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPostList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean taPostList(@ApiParam(value = "客户端", allowableValues = "admin,ma") @PathVariable String client,
+                                   @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
                                    @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                    @ApiParam("名称") @RequestParam(value = "name", required = false) String name,
                                    @ApiParam("分类") @RequestParam(value = "typeId", required = false) String typeId,
@@ -89,6 +102,10 @@ public class TaPostController extends BaseController {
         }
 
         if (iTaPostService.save(taPost)){
+            TaPostData postData = new TaPostData();
+            postData.setPostId(taPost.getPostId());
+            iTaPostDataService.save(postData);
+
             return ResponseBean.success(iTaPostService.getById(taPost.getPostId()));
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -133,12 +150,53 @@ public class TaPostController extends BaseController {
     }
 
     /**
-     * 根据id查询对象
+     * 根据id查询文章详情
      * @param id  实体ID
      */
-    @RequestMapping(value="/admin/post/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPostGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
-        return ResponseBean.success(iTaPostService.getById(id));
+    @RequestMapping(value="/{client}/post/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = TaPost.class)
+    public ResponseBean taPostGet(@ApiParam(value = "客户端", allowableValues = "admin,ma") @PathVariable String client,
+                                  @ApiParam("文章ID") @PathVariable String id) throws Exception{
+
+        Map<String, Object> result = new HashMap<>();
+
+        // 获取文章信息
+        TaPost taPost = iTaPostService.getById(id);
+        if (null == taPost || Constants.STATUS_DELETED.equals(taPost.getStatus())) {
+            throw new Exception("文章内容不存在");
+        }
+
+        // 获取统计信息
+        TaPostData taPostData = iTaPostDataService.getById(id);
+
+
+        // 获取试题
+        List<TaPostTest> postTestList = new ArrayList<>();
+        if ("admin".equals(client)) {
+            postTestList = iTaPostTestService.getListByPostId(id);
+        } else {
+            // 当前人员是否收藏过
+            TaPerson taPerson = getCurrentPerson();
+            boolean saved = iTaPostSaveService.checkSaved(taPerson.getPersonId(), id);
+            result.put("saved", saved);
+
+            // 埋点数据
+            iTaPostDataService.recordBy(id, taPerson);
+
+            // 随机取题目
+            if (null != taPost.getAnswerNum() && taPost.getAnswerNum() > 0) {
+                for (int i = 0; i < taPost.getAnswerNum(); i++) {
+                    TaPostTest taPostTest = iTaPostTestService.getRandRowBy(id);
+                    taPostTest.setCorrectAnswers(null);
+                    postTestList.add(taPostTest);
+                }
+            }
+        }
+
+        result.put("post", taPost);
+        result.put("postData", taPostData);
+        result.put("postTest", postTestList);
+
+        return ResponseBean.success(result);
     }
 }

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

@@ -0,0 +1,128 @@
+package com.yunzhi.demo.controller;
+
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
+import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
+import com.yunzhi.demo.common.*;
+import com.yunzhi.demo.entity.TaPerson;
+import com.yunzhi.demo.entity.TaPersonData;
+import com.yunzhi.demo.service.ITaPersonDataService;
+import com.yunzhi.demo.service.ITaPersonService;
+import com.yunzhi.demo.vo.WxMaAuthParam;
+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.*;
+
+import java.util.HashMap;
+import java.util.Map;
+
+
+@Api(tags = "微信小程序")
+@RestController
+@RequestMapping("/ma")
+public class WxMaController extends BaseController {
+
+    @Autowired
+    WxUtils wxUtils;
+
+    @Autowired
+    ITaPersonService iTaPersonService;
+
+    @Autowired
+    ITaPersonDataService iTaPersonDataService;
+
+    @PostMapping("/login")
+    @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean login(@ApiParam("登录参数") String code) throws Exception {
+        WxMaJscode2SessionResult info = wxUtils.getService().getUserService().getSessionInfo(code);
+
+        String openid = info.getOpenid();
+        TaPerson taPerson = iTaPersonService.getByOpenid(openid);
+        if (null == taPerson) {
+            taPerson = new TaPerson();
+            taPerson.setOpenid(openid);
+            iTaPersonService.save(taPerson);
+
+            TaPersonData taPersonData = new TaPersonData();
+            taPersonData.setPersonId(taPerson.getPersonId());
+            iTaPersonDataService.save(taPersonData);
+        }
+
+        Map<String, Object> tokenClaims = new HashMap<>();
+        tokenClaims.put("userId", taPerson.getPersonId());
+        tokenClaims.put("sessionKey", info.getSessionKey());
+        tokenClaims.put("miniApp", true);
+        String token = JWTUtils.encode(tokenClaims);
+
+        Map<String, Object> rtn = new HashMap<>();
+        rtn.put("person", taPerson);
+        rtn.put("token", token);
+
+        return ResponseBean.success(rtn);
+    }
+
+    @PutMapping("/auth-user")
+    @ApiOperation(value="授权头像", notes = "授权头像", httpMethod = "POST", response = TaPerson.class)
+    public ResponseBean updateUserInfo(@ApiParam("授权头像的参数") @RequestBody WxMaAuthParam params) throws Exception {
+        String sessionKey = (String) CurrentContext.getTokenParam().get("sessionKey");
+
+        checkAuthParams(params, sessionKey);
+
+        // 解密用户信息
+        WxMaUserInfo userInfo = wxUtils.getService().getUserService().getUserInfo(sessionKey, params.getEncryptedData(), params.getIv());
+
+        TaPerson taPerson = getCurrentPerson();
+        if (null == taPerson) {
+            throw new Exception("校验当前人员失败, 请重试");
+        }
+
+        taPerson.setAvatar(userInfo.getAvatarUrl());
+        taPerson.setNickName(userInfo.getNickName());
+        taPerson.setSex("1".equals(userInfo.getGender()) ? 1 : 2);
+
+        iTaPersonService.updateById(taPerson);
+
+        return ResponseBean.success(taPerson);
+    }
+
+    @ApiOperation(value="授权手机", notes = "授权手机", httpMethod = "POST", response = TaPerson.class)
+    @PutMapping("/auth-phone")
+    public ResponseBean updateUserPhone(@ApiParam("授权手机的参数") @RequestBody WxMaAuthParam params) throws Exception {
+        String sessionKey = (String) CurrentContext.getTokenParam().get("sessionKey");
+
+        checkAuthParams(params, sessionKey);
+
+        // 解密
+        WxMaPhoneNumberInfo phoneNoInfo = wxUtils.getService().getUserService().getPhoneNoInfo(sessionKey, params.getEncryptedData(), params.getIv());
+
+        TaPerson taPerson = getCurrentPerson();
+        if (null == taPerson) {
+            throw new Exception("校验当前人员失败, 请重试");
+        }
+
+        taPerson.setPhone(phoneNoInfo.getPhoneNumber());
+        iTaPersonService.updateById(taPerson);
+
+        return ResponseBean.success(taPerson);
+    }
+
+    private void checkAuthParams(WxMaAuthParam params, String sessionKey) throws Exception {
+        String signature = params.getSignature();
+        String rawData = params.getRawData();
+        String encryptedData = params.getEncryptedData();
+        String iv = params.getIv();
+
+        if (StringUtils.isEmpty(signature) || StringUtils.isEmpty(rawData) || StringUtils.isEmpty(encryptedData) || StringUtils.isEmpty(iv)) {
+            throw new Exception("缺失授权参数");
+        }
+
+        boolean isValid = wxUtils.getService().getUserService().checkUserInfo(sessionKey, rawData, signature);
+        if (!isValid) {
+            throw new Exception("校验授权参数失败, 请重试");
+        }
+
+        return;
+    }
+}

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

@@ -27,9 +27,12 @@ public class TaPerson implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "人员ID")
-    @TableId(value = "person_id", type = IdType.INPUT)
+    @TableId(value = "person_id", type = IdType.UUID)
     private String personId;
 
+    @ApiModelProperty(value = "openid")
+    private String openid;
+
     @ApiModelProperty(value = "姓名")
     private String name;
 

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

@@ -2,8 +2,12 @@ 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 java.util.List;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -84,5 +88,4 @@ public class TaPost implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateDate;
 
-
 }

src/main/java/com/yunzhi/demo/interceptor/PermissionInterceptor.java

@@ -5,8 +5,11 @@ import com.yunzhi.demo.common.CurrentContext;
 import com.yunzhi.demo.common.JWTUtils;
 import com.yunzhi.demo.common.ResponseBean;
 import com.yunzhi.demo.common.StringUtils;
+import com.yunzhi.demo.service.ISysUserService;
+import com.yunzhi.demo.service.ITaPersonService;
 import com.yunzhi.demo.vo.TokenParam;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
@@ -34,7 +37,7 @@ public class PermissionInterceptor implements HandlerInterceptor {
 
         try {
             Map<String, Object> tokenMap = JWTUtils.decode(jws);
-            CurrentContext.setTokenParam(TokenParam.fromMap(tokenMap));
+            CurrentContext.setTokenParam(tokenMap);
         } catch (Exception e) {
             log.error("鉴权失败: {}", e.getMessage());
             responseTokenError(response, "鉴权失败, 请重新登录");

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

@@ -15,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaPostDataMapper extends BaseMapper<TaPostData> {
 
+    int updatePvUvBy(String postId, int addUv, int addPv);
 }

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

@@ -15,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaPostTestMapper extends BaseMapper<TaPostTest> {
 
+    TaPostTest getRandRowBy(String postId);
 }

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

@@ -15,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaReadLogMapper extends BaseMapper<TaReadLog> {
 
+    int countBy(String personId, String postId);
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.demo.service;
 import com.yunzhi.demo.entity.SysBanner;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 广告栏 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ISysBannerService extends IService<SysBanner> {
 
+    List<SysBanner> getIndexList();
 }

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPersonService extends IService<TaPerson> {
 
+    TaPerson getByOpenid(String openid);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.demo.service;
 
+import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.entity.TaPostData;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPostDataService extends IService<TaPostData> {
 
+    void recordBy(String postId, TaPerson taPerson);
 }

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

@@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPostSaveService extends IService<TaPostSave> {
 
+    boolean checkSaved(String personId, String postId);
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.demo.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yunzhi.demo.entity.TaPost;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -13,4 +14,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPostService extends IService<TaPost> {
 
+    IPage<TaPost> getIndexList(IPage<TaPost> page);
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.demo.service;
 import com.yunzhi.demo.entity.TaPostTest;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 题库 服务类
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaPostTestService extends IService<TaPostTest> {
 
+    List<TaPostTest> getListByPostId(String postId);
+
+    TaPostTest getRandRowBy(String postId);
 }

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

@@ -3,6 +3,8 @@ package com.yunzhi.demo.service;
 import com.yunzhi.demo.entity.TaTopic;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  * 热门 服务类
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ITaTopicService extends IService<TaTopic> {
 
+    List<TaTopic> getIndexList();
 }

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

@@ -1,11 +1,15 @@
 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.SysBanner;
 import com.yunzhi.demo.mapper.SysBannerMapper;
 import com.yunzhi.demo.service.ISysBannerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 广告栏 服务实现类
@@ -17,4 +21,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysBannerServiceImpl extends ServiceImpl<SysBannerMapper, SysBanner> implements ISysBannerService {
 
+    @Override
+    public List<SysBanner> getIndexList() {
+        QueryWrapper<SysBanner> queryWrapper = new QueryWrapper<SysBanner>()
+                .eq("status", Constants.STATUS_NORMAL)
+                .orderByAsc("sort_no");
+        return list(queryWrapper);
+    }
 }

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

@@ -1,5 +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.mapper.TaPersonMapper;
 import com.yunzhi.demo.service.ITaPersonService;
@@ -17,4 +19,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
+    @Override
+    public TaPerson getByOpenid(String openid) {
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<TaPerson>()
+                .eq("openid", openid)
+                .gt("status", Constants.STATUS_DELETED);
+        return getOne(queryWrapper);
+    }
 }

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

@@ -1,9 +1,15 @@
 package com.yunzhi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.demo.entity.TaPerson;
 import com.yunzhi.demo.entity.TaPostData;
+import com.yunzhi.demo.entity.TaReadLog;
 import com.yunzhi.demo.mapper.TaPostDataMapper;
+import com.yunzhi.demo.mapper.TaReadLogMapper;
 import com.yunzhi.demo.service.ITaPostDataService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,4 +23,29 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPostDataServiceImpl extends ServiceImpl<TaPostDataMapper, TaPostData> implements ITaPostDataService {
 
+    @Autowired
+    TaPostDataMapper taPostDataMapper;
+
+    @Autowired
+    TaReadLogMapper taReadLogMapper;
+
+    @Async
+    @Override
+    public void recordBy(String postId, TaPerson taPerson) {
+        // 先查询当前人员以前有没有阅读过
+        int cnt = taReadLogMapper.countBy(taPerson.getPersonId(), postId);
+
+        int addPv = 1;
+        int addUv = cnt > 0 ? 0 : 1;
+
+        taPostDataMapper.updatePvUvBy(postId, addUv, addPv);
+
+        // 如果当前人员以前未读过
+        if (cnt == 0) {
+            TaReadLog taReadLog = new TaReadLog();
+            taReadLog.setPostId(postId);
+            taReadLog.setPersonId(taPerson.getPersonId());
+            taReadLogMapper.insert(taReadLog);
+        }
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.yunzhi.demo.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.demo.entity.TaPostSave;
 import com.yunzhi.demo.mapper.TaPostSaveMapper;
 import com.yunzhi.demo.service.ITaPostSaveService;
@@ -17,4 +18,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPostSaveServiceImpl extends ServiceImpl<TaPostSaveMapper, TaPostSave> implements ITaPostSaveService {
 
+    @Override
+    public boolean checkSaved(String personId, String postId) {
+        QueryWrapper<TaPostSave> queryWrapper = new QueryWrapper<TaPostSave>()
+                .eq("person_id", personId)
+                .eq("post_id", postId);
+        return count(queryWrapper) > 0;
+    }
 }

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

@@ -1,5 +1,8 @@
 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.mapper.TaPostMapper;
 import com.yunzhi.demo.service.ITaPostService;
@@ -17,4 +20,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPostServiceImpl extends ServiceImpl<TaPostMapper, TaPost> implements ITaPostService {
 
+    @Override
+    public IPage<TaPost> getIndexList(IPage<TaPost> page) {
+        QueryWrapper<TaPost> queryWrapper = new QueryWrapper<TaPost>()
+                .eq("status", Constants.STATUS_NORMAL)
+                .orderByDesc("create_date");
+        return page(page, queryWrapper);
+    }
 }

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

@@ -1,11 +1,16 @@
 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.TaPostTest;
 import com.yunzhi.demo.mapper.TaPostTestMapper;
 import com.yunzhi.demo.service.ITaPostTestService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 题库 服务实现类
@@ -17,4 +22,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaPostTestServiceImpl extends ServiceImpl<TaPostTestMapper, TaPostTest> implements ITaPostTestService {
 
+    @Autowired
+    TaPostTestMapper taPostTestMapper;
+
+    @Override
+    public List<TaPostTest> getListByPostId(String postId) {
+        QueryWrapper<TaPostTest> queryWrapper = new QueryWrapper<TaPostTest>()
+                .eq("post_id", postId)
+                .gt("status", Constants.STATUS_DELETED)
+                .orderByDesc("create_date");
+        return list(queryWrapper);
+    }
+
+    @Override
+    public TaPostTest getRandRowBy(String postId) {
+        return taPostTestMapper.getRandRowBy(postId);
+    }
 }

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

@@ -1,11 +1,15 @@
 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.TaTopic;
 import com.yunzhi.demo.mapper.TaTopicMapper;
 import com.yunzhi.demo.service.ITaTopicService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 热门 服务实现类
@@ -17,4 +21,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaTopicServiceImpl extends ServiceImpl<TaTopicMapper, TaTopic> implements ITaTopicService {
 
+    @Override
+    public List<TaTopic> getIndexList() {
+        QueryWrapper<TaTopic> queryWrapper = new QueryWrapper<TaTopic>()
+                .eq("status", Constants.STATUS_NORMAL)
+                .orderByAsc("sort_no");
+        return list(queryWrapper);
+    }
 }

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

@@ -0,0 +1,23 @@
+package com.yunzhi.demo.vo;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "微信小程序授权", description = "微信小程序授权参数")
+@Data
+public class WxMaAuthParam {
+
+    @ApiModelProperty("signature")
+    String signature;
+
+    @ApiModelProperty("rawData")
+    String rawData;
+
+    @ApiModelProperty("encryptedData")
+    String encryptedData;
+
+    @ApiModelProperty("iv")
+    String iv;
+}

src/main/resources/mapper/TaPostDataMapper.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.TaPostDataMapper">
 
+    <update id="updatePvUvBy">
+        UPDATE ta_post_data
+        SET p_v = p_v + #{addPv},
+            u_v = u_v + #{addUv}
+        WHERE
+            post_id = #{postId}
+    </update>
 </mapper>

src/main/resources/mapper/TaPostTestMapper.xml

@@ -2,4 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.TaPostTestMapper">
 
+    <select id="getRandRowBy" resultType="com.yunzhi.demo.entity.TaPostTest">
+        SELECT
+            t1.*
+        FROM
+            ta_post_test AS t1
+                JOIN (
+                SELECT
+                    ROUND(
+                            RAND( ) * (
+                                ( SELECT MAX( serial_no ) FROM ta_post_test WHERE post_id = #{postId} AND `status` = 1 )
+                                    - ( SELECT MIN( serial_no ) FROM ta_post_test WHERE post_id = #{postId} AND `status` = 1 )
+                            ) + ( SELECT MIN( serial_no ) FROM ta_post_test WHERE post_id = #{postId} AND `status` = 1 )
+                        ) AS serial_no
+            ) AS t2
+        WHERE
+            t1.post_id = #{postId}
+          AND t1.`status` = 1
+          AND t1.serial_no >= t2.serial_no
+        ORDER BY
+            t1.serial_no
+            LIMIT 1
+    </select>
 </mapper>

src/main/resources/mapper/TaReadLogMapper.xml

@@ -2,4 +2,13 @@
 <!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">
 
+    <select id="countBy" resultType="java.lang.Integer">
+        SELECT
+            count( * )
+        FROM
+            ta_read_log t
+        WHERE
+            t.person_id = #{personId}
+          AND t.post_id = #{postId}
+    </select>
 </mapper>