feats

src/main/java/com/yunzhi/liyuanhui/common/JWTUtils.java

@@ -24,7 +24,7 @@ import java.util.Map;
 public class JWTUtils {
 
     // 过期时间 15 分钟
-    static final long EXPIRE_TIME = 15 * 60;
+    static final long EXPIRE_TIME = 30 * 60;
 
     // 私钥
     static final SecretKey SECRET_KEY = Keys.hmacShaKeyFor(Base64.getEncoder().encode("Yansen is so handsome. He is a good man. Everyone like him !!!".getBytes()));

src/main/java/com/yunzhi/liyuanhui/controller/TaActivityController.java

@@ -9,15 +9,9 @@ import com.yunzhi.liyuanhui.common.StringUtils;
 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.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import com.yunzhi.liyuanhui.service.ITaActivityService;
 import com.yunzhi.liyuanhui.entity.TaActivity;
-import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -64,6 +58,16 @@ public class TaActivityController extends BaseController {
         return ResponseBean.success(result);
     }
 
+    @GetMapping("/wx/person/{personId}/activity")
+    public ResponseBean getActivityOfPerson(@PathVariable Integer personId,
+                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
+
+        IPage<TaActivity> pg = new Page<>(pageNum, pageSize);
+        IPage<TaActivity> result = iTaActivityService.getListByPersonId(pg, personId);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 保存对象
      * @param taActivity 实体对象

src/main/java/com/yunzhi/liyuanhui/mapper/TaActivityMapper.java

@@ -1,18 +1,20 @@
-package com.yunzhi.liyuanhui.mapper;
-
-import com.yunzhi.liyuanhui.entity.TaActivity;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * <p>
- * 活动 Mapper 接口
- * </p>
- *
- * @author yansen
- * @since 2020-08-08
- */
-@Mapper
-public interface TaActivityMapper extends BaseMapper<TaActivity> {
-
-}
+package com.yunzhi.liyuanhui.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.liyuanhui.entity.TaActivity;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 活动 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-08
+ */
+@Mapper
+public interface TaActivityMapper extends BaseMapper<TaActivity> {
+
+    IPage<TaActivity> getListByPersonId(IPage<TaActivity> pg, Integer personId);
+}

src/main/java/com/yunzhi/liyuanhui/service/ITaActivityService.java

@@ -1,17 +1,20 @@
-package com.yunzhi.liyuanhui.service;
-
-import com.yunzhi.liyuanhui.entity.TaActivity;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 活动 服务类
- * </p>
- *
- * @author yansen
- * @since 2020-08-08
- */
-public interface ITaActivityService extends IService<TaActivity> {
-
-    TaActivity getActivityProfile(Integer id) throws Exception;
-}
+package com.yunzhi.liyuanhui.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.liyuanhui.entity.TaActivity;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 活动 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-08
+ */
+public interface ITaActivityService extends IService<TaActivity> {
+
+    TaActivity getActivityProfile(Integer id) throws Exception;
+
+    IPage<TaActivity> getListByPersonId(IPage<TaActivity> pg, Integer personId) throws Exception;
+}

src/main/java/com/yunzhi/liyuanhui/service/impl/TaActivityServiceImpl.java

@@ -1,40 +1,49 @@
-package com.yunzhi.liyuanhui.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.yunzhi.liyuanhui.entity.TaActivity;
-import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
-import com.yunzhi.liyuanhui.enums.StatusEnum;
-import com.yunzhi.liyuanhui.mapper.TaActivityMapper;
-import com.yunzhi.liyuanhui.service.ITaActivityService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yunzhi.liyuanhui.service.ITaActivityVoteItemService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 活动 服务实现类
- * </p>
- *
- * @author yansen
- * @since 2020-08-08
- */
-@Service
-public class TaActivityServiceImpl extends ServiceImpl<TaActivityMapper, TaActivity> implements ITaActivityService {
-
-    @Autowired
-    ITaActivityVoteItemService iTaActivityVoteItemService;
-
-    @Override
-    public TaActivity getActivityProfile(Integer id) throws Exception {
-        TaActivity taActivity = getById(id);
-
-        QueryWrapper<TaActivityVoteItem> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("activity_id", id);
-        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
-        queryWrapper.orderByAsc("sort_no");
-
-        taActivity.setVoteItemList(iTaActivityVoteItemService.list(queryWrapper));
-        return taActivity;
-    }
-}
+package com.yunzhi.liyuanhui.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.liyuanhui.entity.TaActivity;
+import com.yunzhi.liyuanhui.entity.TaActivityVoteItem;
+import com.yunzhi.liyuanhui.enums.StatusEnum;
+import com.yunzhi.liyuanhui.mapper.TaActivityMapper;
+import com.yunzhi.liyuanhui.service.ITaActivityService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.liyuanhui.service.ITaActivityVoteItemService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 活动 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-08-08
+ */
+@Service
+public class TaActivityServiceImpl extends ServiceImpl<TaActivityMapper, TaActivity> implements ITaActivityService {
+
+    @Autowired
+    ITaActivityVoteItemService iTaActivityVoteItemService;
+
+    @Autowired
+    TaActivityMapper taActivityMapper;
+
+    @Override
+    public TaActivity getActivityProfile(Integer id) throws Exception {
+        TaActivity taActivity = getById(id);
+
+        QueryWrapper<TaActivityVoteItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("activity_id", id);
+        queryWrapper.eq("status", StatusEnum.NORMAL.getCode());
+        queryWrapper.orderByAsc("sort_no");
+
+        taActivity.setVoteItemList(iTaActivityVoteItemService.list(queryWrapper));
+        return taActivity;
+    }
+
+    @Override
+    public IPage<TaActivity> getListByPersonId(IPage<TaActivity> pg, Integer personId) throws Exception {
+        return taActivityMapper.getListByPersonId(pg, personId);
+    }
+}

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
-###
-server:
-  port: 8083
-spring:
-  datasource:
-    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/liyuanhui?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
-    username: liyuanhui
+###
+server:
+  port: 8083
+spring:
+  datasource:
+    url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/liyuanhui?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&useSSL=false&allowPublicKeyRetrieval=true
+    username: liyuanhui
     password: abcd@123456

src/main/resources/mapper/TaActivityMapper.xml

@@ -1,5 +1,16 @@
-<?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.liyuanhui.mapper.TaActivityMapper">
-
-</mapper>
+<?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.liyuanhui.mapper.TaActivityMapper">
+
+    <select id="getListByPersonId" resultType="com.yunzhi.liyuanhui.entity.TaActivity">
+        SELECT
+            t.*
+        FROM ta_activity t
+        LEFT JOIN ta_activity_enroll s ON t.activity_id = s.activity_id
+        WHERE
+            s.person_id = #{personId}
+        ORDER BY
+            s.create_date DESC,
+            t.create_date DESC
+    </select>
+</mapper>