feats

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

@@ -1,5 +1,6 @@
 package com.yunzhi.training.common;
 
+import cn.hutool.json.JSONObject;
 import com.yunzhi.training.entity.SysUser;
 import com.yunzhi.training.entity.TaPerson;
 import com.yunzhi.training.service.ISysUserService;
@@ -23,7 +24,10 @@ public class BaseController {
      * @return
      */
     public SysUser getCurrentUser(HttpServletRequest request) throws Exception {
-        String userId = request.getHeader("x-userid");
+        String token = JWTUtils.getToken(request);
+        JSONObject tkJSON = JWTUtils.decode(token);
+
+        String userId = tkJSON.get("userId", String.class);
         if (StringUtils.isEmpty(userId)) {
             throw new Exception("获取当前人员信息失败");
         }
@@ -41,7 +45,10 @@ public class BaseController {
      * @return
      */
     public TaPerson getCurrentPerson(HttpServletRequest request) throws Exception {
-        String personId = request.getHeader("x-person");
+        String token = JWTUtils.getToken(request);
+        JSONObject tkJSON = JWTUtils.decode(token);
+
+        String personId = tkJSON.get("userId", String.class);
         if (StringUtils.isEmpty(personId)) {
             throw new Exception("获取当前人员信息失败");
         }

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

@@ -3,9 +3,6 @@ package com.yunzhi.training.common;
 import cn.hutool.json.JSONObject;
 import cn.hutool.jwt.JWT;
 import cn.hutool.jwt.JWTUtil;
-import cn.hutool.jwt.JWTValidator;
-import cn.hutool.jwt.signers.JWTSigner;
-import cn.hutool.jwt.signers.JWTSignerUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -28,7 +25,7 @@ public class JWTUtils {
     public static final long EXPIRE_TIME = 30 * 60 * 24;
 
     // 私钥
-    static final JWTSigner signer = JWTSignerUtil.hs512("Yansen is so handsome. He is a good man. Everyone like him !!!".getBytes());
+    static final byte[] key = "Yansen is so handsome. He is a good man. Everyone like him !!!".getBytes();
 
     // 请求头
     public static final String AUTH_HEADER = "X-Authorization-JWT";
@@ -47,7 +44,8 @@ public class JWTUtils {
                 .setIssuedAt(iat)
                 .setExpiresAt(exp)
                 .addPayloads(claims)
-                .sign(signer);
+                .setKey(key)
+                .sign();
     }
 
     public static JSONObject decode(String token) throws Exception {
@@ -60,10 +58,10 @@ public class JWTUtils {
 
             Object obj = jwt.getPayload("iat");
             if (null != obj) {
-                Date dt = (Date) obj;
+                Integer iat = (Integer) obj;
                 long currentTime = System.currentTimeMillis() / 1000;
                 int oneMinute = 60;
-                if (currentTime - dt.getTime() < oneMinute) {
+                if (currentTime - iat < oneMinute) {
                     return token;
                 }
             }
@@ -73,9 +71,10 @@ public class JWTUtils {
             Date exp = datePair[1];
             jwt.setIssuedAt(iat).setExpiresAt(exp);
 
-            return jwt.sign(signer);
+            return jwt.sign();
         } catch (Exception e) {
-            log.error("解析 JWT Token 失败: {}", e.getMessage());
+            e.printStackTrace();
+            log.error("刷新 JWT Token 失败: {}", e.getMessage());
         }
         return null;
     }
@@ -92,7 +91,10 @@ public class JWTUtils {
     }
 
     public static void verify(String token) throws Exception {
-        JWTValidator.of(token).validateAlgorithm(signer);
+        boolean isOk = JWTUtil.verify(token, key);
+        if (!isOk) {
+            throw new Exception("JWT TOKEN 校验失败");
+        }
     }
 
     private static Date[] getDatePair() {

src/main/java/com/yunzhi/training/controller/LoginController.java

@@ -1,20 +1,27 @@
 package com.yunzhi.training.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.yunzhi.training.common.*;
 import com.yunzhi.training.entity.SysUser;
+import com.yunzhi.training.entity.TaPerson;
+import com.yunzhi.training.entity.TaStudent;
 import com.yunzhi.training.service.ISysUserService;
 import com.yunzhi.training.service.ITaPersonService;
+import com.yunzhi.training.service.ITaStudentService;
 import com.yunzhi.training.vo.ChangePassword;
 import com.yunzhi.training.vo.AdminLoginParam;
-import com.yunzhi.training.vo.LoginParam;
 import com.yunzhi.training.vo.TokenParam;
 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.beans.factory.annotation.Value;
+import org.springframework.http.*;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -31,6 +38,12 @@ public class LoginController extends BaseController {
     @Autowired
     ITaPersonService iTaPersonService;
 
+    @Autowired
+    ITaStudentService iTaStudentService;
+
+    @Value("${yz.mp.openidAPI}")
+    String openidAPI;
+
     @PostMapping("/admin/login")
     @ApiOperation(value="登录", notes = "登录", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean login(@ApiParam("登录参数") @RequestBody AdminLoginParam loginParam) throws Exception {
@@ -65,7 +78,6 @@ public class LoginController extends BaseController {
 
         Map<String, Object> tokenMap = tokenParam.toMap();
         String token = JWTUtils.encode(tokenMap);
-//        CurrentContext.setTokenParam(tokenMap);
 
         Map<String, Object> res = new HashMap<String, Object>() {{
             put("user", sysUser);
@@ -95,43 +107,78 @@ public class LoginController extends BaseController {
         return ResponseBean.success("密码修改成功");
     }
 
+    @ApiParam("客户端登录")
+    @PostMapping("/wx/login")
+    public ResponseBean clientLogin(@ApiParam("code") @RequestParam String code) throws Exception {
+        if (StringUtils.isEmpty(code)) {
+            return ResponseBean.error("登录参数不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
-//    @ApiParam("客户端登录")
-//    @PostMapping("/{appid}/login")
-//    public ResponseBean clientLogin(@ApiParam("APPID") @PathVariable String appid,
-//                                    @ApiParam("登录参数") @RequestBody LoginParam loginParam) throws Exception {
-//        if (null == loginParam) {
-//            return ResponseBean.error("登录参数不存在", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        if (StringUtils.isEmpty(loginParam.getName())
-//            || StringUtils.isEmpty(loginParam.getPhone())
-//            || StringUtils.isEmpty(loginParam.getCaptcha())) {
-//            return ResponseBean.error("登录参数不合法", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        boolean isCapatchRight = smsCaptcha.validate(loginParam.getPhone(), loginParam.getCaptcha());
-//        if (!isCapatchRight) {
-//            return ResponseBean.error("验证码不正确", ResponseBean.ERROR_ILLEGAL_PARAMS);
-//        }
-//
-//        TaPerson taPerson = iTaPersonService.getByPhone(loginParam.getPhone());
-//        if (null != taPerson) {
-//           return ResponseBean.success(taPerson);
-//        }
-//
-//        taPerson = new TaPerson();
-//        taPerson.setNickName(loginParam.getName());
-//        taPerson.setPhone(loginParam.getPhone());
-//        if (iTaPersonService.save(taPerson)) {
-//            Map<String, Object> result = new HashMap<>();
-//            result.put("person", taPerson);
-//
-//            return ResponseBean.success(taPerson);
-//        } else {
-//            return ResponseBean.error("登录失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-//        }
-//    }
+        // restTemplate 用来发送请求
+        RestTemplate restTemplate = new RestTemplate();
+        HttpHeaders headers = new HttpHeaders();
+        headers.setAccept(Arrays.asList(MediaType.APPLICATION_JSON));
+        HttpEntity<String> entity = new HttpEntity<String>(headers);
+        ResponseEntity<String> resp = restTemplate.exchange(String.format(openidAPI, code), HttpMethod.GET, entity, String.class);
+
+        String body = resp.getBody();
+        if (StringUtils.isEmpty(body)) {
+            return ResponseBean.error("登录系统失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        ResponseBean result = JSONUtil.toBean(body, ResponseBean.class);
+        if (result.getCode() != ResponseBean.CODE_SUCCESS) {
+            return result;
+        }
+
+        String openID = (String) result.getData();
+
+        TaPerson taPerson = iTaPersonService.getByOpenID(openID);
+        if (null == taPerson) {
+            taPerson = new TaPerson();
+            taPerson.setOpenid(openID);
+            taPerson.setState(Constants.STATUS_NORMAL);
+            if (!iTaPersonService.save(taPerson)) {
+                return ResponseBean.error("登录系统失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        } else {
+            if (Constants.STATUS_NORMAL != taPerson.getState()) {
+                return ResponseBean.error("您的账户异常, 请联系管理人员", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
+
+        // 先找关联学生
+        TaStudent taStudent = iTaStudentService.getExistBy("person_id", taPerson.getPersonId(), false, true);
+        if (taStudent == null) {
+            // 未找到再依据手机号查找
+            if (!StringUtils.isEmpty(taPerson.getPhone())) {
+                taStudent = iTaStudentService.getExistBy("phone", taPerson.getPhone(), false, true);
+                if (taStudent != null && StringUtils.isEmpty(taStudent.getPersonId())) {
+                    taStudent.setPersonId(taPerson.getPersonId());
+                    try {
+                        iTaStudentService.updateById(taStudent);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+
+        // 生成 token
+        TokenParam tokenParam = new TokenParam()
+                .setUserId(taPerson.getPersonId())
+                .setOrgId("0");
+
+        Map<String, Object> tokenMap = tokenParam.toMap();
+        String token = JWTUtils.encode(tokenMap);
+
+        Map<String, Object> res = new HashMap<>();
+        res.put("person", taPerson);
+        res.put("student", taStudent);
+        res.put("token", token);
+
+        return ResponseBean.success(res);
+    }
 
 //    @PutMapping("/admin/reset-password/{userId}")
 //    @ApiOperation(value="重置密码", notes = "重置密码", httpMethod = "PUT", response = ResponseBean.class)

src/main/java/com/yunzhi/training/controller/TaAnswerController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
     * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 
 @Api(tags = "问题答案")

src/main/java/com/yunzhi/training/controller/TaAttachmentController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
     * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 
 @Api(tags = "附件表")

src/main/java/com/yunzhi/training/controller/TaBannerController.java

@@ -0,0 +1,145 @@
+package com.yunzhi.training.controller;
+
+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.training.common.BaseController;
+import com.yunzhi.training.common.Constants;
+import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.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 com.yunzhi.training.service.ITaBannerService;
+import com.yunzhi.training.entity.TaBanner;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * Banner表 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+
+@Api(tags = "Banner表")
+@RestController
+@RequestMapping("/")
+public class TaBannerController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaBannerController.class);
+
+    @Autowired
+    public ITaBannerService iTaBannerService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/banner",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taBannerList(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                     @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("位置") @RequestParam(value ="position", required = false) String position) throws Exception{
+
+        if (!"admin".equals(client) && !"wx".equals(client)) {
+            return ResponseBean.error("不支持的请求", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        IPage<TaBanner> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaBanner> queryWrapper = new QueryWrapper<>();
+        queryWrapper.gt("admin".equals(client), "state", Constants.STATUS_DELETED);
+        queryWrapper.eq("wx".equals(client), "state", Constants.STATUS_NORMAL);
+        queryWrapper.eq(!StringUtils.isEmpty(position), "position", position);
+        queryWrapper.orderByDesc("sort_no");
+
+        IPage<TaBanner> result = iTaBannerService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taBanner 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/banner",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taBannerAdd(@ApiParam("保存内容") @RequestBody TaBanner taBanner) throws Exception{
+
+//        if (StringUtils.isEmpty(taBanner.getCourseId())) {
+//            return ResponseBean.error("请设置关联课程", ResponseBean.ERROR_ILLEGAL_PARAMS);
+//        }
+
+        if (StringUtils.isEmpty(taBanner.getTitle())) {
+            return ResponseBean.error("Banner 名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taBanner.setBannerId(null);
+
+        if (iTaBannerService.save(taBanner)){
+            return ResponseBean.success(taBanner);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/banner/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taBannerDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaBannerService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taBanner 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/banner/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taBannerUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                        @ApiParam("更新内容") @RequestBody TaBanner taBanner) throws Exception{
+
+        taBanner.setBannerId(id);
+        if (StringUtils.isEmpty(taBanner.getTitle())) {
+            return ResponseBean.error("Banner 名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (iTaBannerService.updateById(taBanner)){
+            return ResponseBean.success(iTaBannerService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/banner/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taBannerGet(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaBannerService.getExistBy("banner_id", id, false, true));
+    }
+}

src/main/java/com/yunzhi/training/controller/TaCourseController.java

@@ -0,0 +1,157 @@
+package com.yunzhi.training.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.training.common.*;
+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 com.yunzhi.training.service.ITaCourseService;
+import com.yunzhi.training.entity.TaCourse;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 课程表 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+
+@Api(tags = "课程表")
+@RestController
+@RequestMapping("/")
+public class TaCourseController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCourseController.class);
+
+    @Autowired
+    public ITaCourseService iTaCourseService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/course",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taCourseList(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                     @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                     @ApiParam("名称") @RequestParam(value ="title", required = false) String title,
+                                     @ApiParam(value = "开始时间", example = "2022-02-21") @RequestParam(value ="startDate", required = false) String startDate,
+                                     @ApiParam(value = "结束时间", example = "2022-02-28") @RequestParam(value ="endDate", required = false) String endDate) throws Exception{
+        LocalDateTime start = null;
+        LocalDateTime end = null;
+        if ((StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)) || (!StringUtils.isEmpty(startDate) && StringUtils.isEmpty(endDate))) {
+            return ResponseBean.error("请选择完整的开始结束时间", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        IPage<TaCourse> pg = new Page<>(pageNum, pageSize);
+
+        if (!StringUtils.isEmpty(startDate)) {
+            start = DateUtils.from(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            end = DateUtils.from(endDate + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+        }
+
+        IPage<TaCourse> result = iTaCourseService.getPagedBy(pg, client, title, start, end);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taCourse 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/course",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taCourseAdd(@ApiParam("保存内容") @RequestBody TaCourse taCourse) throws Exception{
+
+        if (StringUtils.isEmpty(taCourse.getTitle())) {
+            return ResponseBean.error("课程名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        int cnt = iTaCourseService.countBy("title", taCourse.getTitle(), true);
+        if (cnt > 0) {
+            return ResponseBean.error("课程名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taCourse.setCourseId(null);
+
+        if (iTaCourseService.save(taCourse)){
+            return ResponseBean.success(taCourse);
+        } else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/course/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taCourseDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaCourseService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCourse 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/course/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taCourseUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                        @ApiParam("更新内容") @RequestBody TaCourse taCourse) throws Exception{
+
+        if (StringUtils.isEmpty(taCourse.getTitle())) {
+            return ResponseBean.error("课程名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaCourse origin = iTaCourseService.getById(id);
+        if (null == origin || Constants.STATUS_DELETED == origin.getState()) {
+            return ResponseBean.error("更新失败, 未找到有效资源", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaCourse exist = iTaCourseService.getByButNot("title", taCourse.getTitle(), "course_id", id, true);
+        if (exist != null) {
+            return ResponseBean.error("课程称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (iTaCourseService.updateById(taCourse)){
+            return ResponseBean.success(iTaCourseService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/course/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taCourseGet(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                    @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaCourseService.getExistBy("course_id", id, "wx".equals(client), true));
+    }
+}

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

@@ -5,6 +5,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.training.common.BaseController;
 import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.common.SMSCaptcha;
+import com.yunzhi.training.common.StringUtils;
+import com.yunzhi.training.entity.TaStudent;
+import com.yunzhi.training.service.ITaStudentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -20,13 +24,15 @@ import com.yunzhi.training.service.ITaPersonService;
 import com.yunzhi.training.entity.TaPerson;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 人员表 前端控制器
     * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 
 @Api(tags = "人员表")
@@ -39,6 +45,11 @@ public class TaPersonController extends BaseController {
     @Autowired
     public ITaPersonService iTaPersonService;
 
+    @Autowired
+    public ITaStudentService iTaStudentService;
+
+    @Autowired
+    public SMSCaptcha smsCaptcha;
 
     /**
      * 分页查询列表
@@ -51,43 +62,43 @@ public class TaPersonController extends BaseController {
     public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
-		    IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
+        IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.orderByDesc("create_date");
 
-            IPage<TaPerson> result = iTaPersonService.page(pg, queryWrapper);
-            return ResponseBean.success(result);
+        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{
+//    /**
+//     * 保存对象
+//     * @param taPerson 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/wx/person",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);
+//        }
+//    }
 
-        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);
-        }
-    }
+//    /**
+//     * 根据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);
+//        }
+//    }
 
     /**
      * 修改对象
@@ -95,11 +106,62 @@ public class TaPersonController extends BaseController {
      * @param taPerson 实体对象
      * @return
      */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/wx/person/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taPersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+    public ResponseBean taPersonUpdate(@ApiParam("对象ID") @PathVariable String id,
                                         @ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
 
+        if (StringUtils.isEmpty(taPerson.getPhone())) {
+            return ResponseBean.error("手机号不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+
+
+        if ((!StringUtils.isEmpty(taPerson.getTermId()) && StringUtils.isEmpty(taPerson.getClassId()))
+            || (StringUtils.isEmpty(taPerson.getTermId()) && !StringUtils.isEmpty(taPerson.getClassId()))) {
+            return ResponseBean.error("请正确的设置学期与班级", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (!StringUtils.isEmpty(taPerson.getTermId())) {
+            taPerson.setPersonType("student");
+        } else {
+            taPerson.setPersonType("");
+        }
+
+        // 找对应的学生信息
+        TaStudent taStudent = getStudent(taPerson);
+        if (taStudent != null && StringUtils.isEmpty(taStudent.getPersonId())) {
+            // 映射信息
+            taStudent.setPersonId(taPerson.getPersonId());
+            taStudent.setName(taPerson.getName());
+            taStudent.setPhone(taPerson.getPhone());
+
+            if (!StringUtils.isEmpty(taPerson.getTermId())) {
+                taStudent.setTermId(taPerson.getTermId());
+                taStudent.setClassId(taPerson.getClassId());
+            }
+
+            try {
+                iTaStudentService.updateById(taStudent);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        // 如果没有映射学生, 但是当前人员是学生身份, 则建立关系
+        if (taStudent == null && !StringUtils.isEmpty(taPerson.getTermId())) {
+            taStudent = new TaStudent();
+            taStudent.setPersonId(taPerson.getPersonId());
+            taStudent.setName(taPerson.getName());
+            taStudent.setPhone(taPerson.getPhone());
+            taStudent.setTermId(taPerson.getTermId());
+            taStudent.setClassId(taPerson.getClassId());
+
+            if (!iTaStudentService.save(taStudent)) {
+                return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
+
         if (iTaPersonService.updateById(taPerson)){
             return ResponseBean.success(iTaPersonService.getById(id));
         }else {
@@ -109,11 +171,23 @@ public class TaPersonController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
      */
-    @RequestMapping(value="/taPerson/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/wx/person/current",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));
+    public ResponseBean taPersonGet(HttpServletRequest request) throws Exception{
+        return ResponseBean.success(getCurrentPerson(request));
+    }
+
+    public TaStudent getStudent(TaPerson taPerson) {
+        // 先找关联学生
+        TaStudent taStudent = iTaStudentService.getExistBy("person_id", taPerson.getPersonId(), false, true);
+        if (taStudent == null) {
+            // 未找到再依据手机号查找
+            if (!StringUtils.isEmpty(taPerson.getPhone())) {
+                taStudent = iTaStudentService.getExistBy("phone", taPerson.getPhone(), false, true);
+            }
+        }
+
+        return taStudent;
     }
 }

src/main/java/com/yunzhi/training/controller/TaQuePersonController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
     * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 
 @Api(tags = "问卷参与人")

src/main/java/com/yunzhi/training/controller/TaQuestionController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
     * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 
 @Api(tags = "问卷问题")

src/main/java/com/yunzhi/training/controller/TaQuestionPersonController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
     * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 
 @Api(tags = "答卷明细")

src/main/java/com/yunzhi/training/controller/TaQuestionnaireController.java

@@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.RestController;
     * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 
 @Api(tags = "问卷调查")

src/main/java/com/yunzhi/training/controller/TaSchoolClassController.java

@@ -0,0 +1,169 @@
+package com.yunzhi.training.controller;
+
+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.training.common.BaseController;
+import com.yunzhi.training.common.Constants;
+import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.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 com.yunzhi.training.service.ITaSchoolClassService;
+import com.yunzhi.training.entity.TaSchoolClass;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 班级 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+
+@Api(tags = "班级")
+@RestController
+@RequestMapping("/")
+public class TaSchoolClassController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaSchoolClassController.class);
+
+    @Autowired
+    public ITaSchoolClassService iTaSchoolClassService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/school-class",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taSchoolClassList(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                          @ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          @ApiParam("所属学期") @RequestParam(value ="termId", required = false) String termId,
+                                          @ApiParam("名称") @RequestParam(value ="name", required = false) String name) throws Exception{
+
+        IPage<TaSchoolClass> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaSchoolClass> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(!StringUtils.isEmpty(termId), "term_id", termId);
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%"+name+"%");
+        queryWrapper.gt("admin".equals(client), "state", Constants.STATUS_DELETED);
+        queryWrapper.eq("wx".equals(client), "state", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaSchoolClass> result = iTaSchoolClassService.getPageBy(pg, termId, name, client);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taSchoolClass 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/school-class",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taSchoolClassAdd(@ApiParam("保存内容") @RequestBody TaSchoolClass taSchoolClass) throws Exception{
+
+        if (StringUtils.isEmpty(taSchoolClass.getTermId())) {
+            return ResponseBean.error("请设置班级所属学期", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(taSchoolClass.getName())) {
+            return ResponseBean.error("班级名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        int cnt = iTaSchoolClassService.countName(taSchoolClass.getTermId(), taSchoolClass.getName());
+        if (cnt > 0) {
+            return ResponseBean.error("班级名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taSchoolClass.setClassId(null);
+        taSchoolClass.setCreateDate(LocalDateTime.now());
+
+        if (iTaSchoolClassService.save(taSchoolClass)){
+            return ResponseBean.success(taSchoolClass);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/school-class/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taSchoolClassDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaSchoolClassService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taSchoolClass 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/school-class/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taSchoolClassUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                        @ApiParam("更新内容") @RequestBody TaSchoolClass taSchoolClass) throws Exception{
+        if (StringUtils.isEmpty(taSchoolClass.getTermId())) {
+            return ResponseBean.error("请设置班级所属学期", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (StringUtils.isEmpty(taSchoolClass.getName())) {
+            return ResponseBean.error("班级名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaSchoolClass origin = iTaSchoolClassService.getById(id);
+        if (null == origin || Constants.STATUS_DELETED == origin.getState()) {
+            return ResponseBean.error("更新失败, 未找到有效资源", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taSchoolClass.setClassId(id);
+        boolean isOnly = iTaSchoolClassService.checkOnly(taSchoolClass);
+        if (!isOnly) {
+            return ResponseBean.error("班级名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        origin.setName(taSchoolClass.getName());
+        origin.setTermId(taSchoolClass.getTermId());
+        origin.setState(taSchoolClass.getState());
+
+        if (iTaSchoolClassService.updateById(origin)){
+            return ResponseBean.success(origin);
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/school-class/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taSchoolClassGet(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                         @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaSchoolClassService.getExistBy("class_id", id, "wx".equals(client), true));
+    }
+}

src/main/java/com/yunzhi/training/controller/TaSchoolTermController.java

@@ -0,0 +1,162 @@
+package com.yunzhi.training.controller;
+
+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.training.common.BaseController;
+import com.yunzhi.training.common.Constants;
+import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.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 com.yunzhi.training.service.ITaSchoolTermService;
+import com.yunzhi.training.entity.TaSchoolTerm;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 学期 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+
+@Api(tags = "学期")
+@RestController
+@RequestMapping("/")
+public class TaSchoolTermController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaSchoolTermController.class);
+
+    @Autowired
+    public ITaSchoolTermService iTaSchoolTermService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/{client}/school-term",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taSchoolTermList(@ApiParam(value = "客户端",allowableValues = "admin,wx") @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) throws Exception{
+
+        if (!"admin".equals(client) && !"wx".equals(client)) {
+            return ResponseBean.error("不支持的请求", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        IPage<TaSchoolTerm> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaSchoolTerm> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%"+name+"%");
+        queryWrapper.gt("admin".equals(client), "state", Constants.STATUS_DELETED);
+        queryWrapper.eq("wx".equals(client), "state", Constants.STATUS_NORMAL);
+        queryWrapper.orderByDesc("create_date");
+
+        IPage<TaSchoolTerm> result = iTaSchoolTermService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taSchoolTerm 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/school-term",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taSchoolTermAdd(@ApiParam("保存内容") @RequestBody TaSchoolTerm taSchoolTerm) throws Exception{
+
+        if (StringUtils.isEmpty(taSchoolTerm.getName())) {
+            return ResponseBean.error("学期名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        int cnt = iTaSchoolTermService.countBy("name", taSchoolTerm.getName(), true);
+        if (cnt > 0) {
+            return ResponseBean.error("学期名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taSchoolTerm.setTermId(null);
+        taSchoolTerm.setCreateDate(LocalDateTime.now());
+
+        if (iTaSchoolTermService.save(taSchoolTerm)){
+            return ResponseBean.success(taSchoolTerm);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/school-term/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taSchoolTermDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaSchoolTermService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taSchoolTerm 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/school-term/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taSchoolTermUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                           @ApiParam("更新内容") @RequestBody TaSchoolTerm taSchoolTerm) throws Exception{
+
+        if (StringUtils.isEmpty(taSchoolTerm.getName())) {
+            return ResponseBean.error("学期名称不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaSchoolTerm origin = iTaSchoolTermService.getById(id);
+        if (null == origin || Constants.STATUS_DELETED == origin.getState()) {
+            return ResponseBean.error("更新失败, 未找到有效资源", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        TaSchoolTerm exist = iTaSchoolTermService.getByButNot("name", taSchoolTerm.getName(), "term_id", id, true);
+        if (exist != null) {
+            return ResponseBean.error("学期名称重复", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        origin.setName(taSchoolTerm.getName());
+        origin.setState(taSchoolTerm.getState());
+
+        if (iTaSchoolTermService.updateById(origin)){
+            return ResponseBean.success(origin);
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/school-term/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taSchoolTermGet(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                        @ApiParam("对象ID") @PathVariable String id) throws Exception{
+        return ResponseBean.success(iTaSchoolTermService.getExistBy("term_id", id, "wx".equals(client), true));
+    }
+}

src/main/java/com/yunzhi/training/controller/TaSignInController.java

@@ -0,0 +1,159 @@
+package com.yunzhi.training.controller;
+
+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.training.common.*;
+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 com.yunzhi.training.service.ITaSignInService;
+import com.yunzhi.training.entity.TaSignIn;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+    * 签到主表 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+
+@Api(tags = "签到主表")
+@RestController
+@RequestMapping("/")
+public class TaSignInController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaSignInController.class);
+
+    @Autowired
+    public ITaSignInService iTaSignInService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/sign-in",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taSignInList(@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(value = "开始时间", example = "2022-02-21") @RequestParam(value ="startDate", required = false) String startDate,
+                                     @ApiParam(value = "结束时间", example = "2022-02-28") @RequestParam(value ="endDate", required = false) String endDate) throws Exception{
+        LocalDateTime start = null;
+        LocalDateTime end = null;
+        if ((StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)) || (!StringUtils.isEmpty(startDate) && StringUtils.isEmpty(endDate))) {
+            return ResponseBean.error("请选择完整的开始结束时间", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        IPage<TaSignIn> pg = new Page<>(pageNum, pageSize);
+        QueryWrapper<TaSignIn> queryWrapper = new QueryWrapper<>();
+        queryWrapper.like(!StringUtils.isEmpty(name), "name", "%"+name+"%");
+        queryWrapper.gt("state", Constants.STATUS_DELETED);
+        queryWrapper.orderByDesc("create_date");
+
+        if (!StringUtils.isEmpty(startDate)) {
+            start = DateUtils.from(startDate + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
+            end = DateUtils.from(endDate + " 23:59:59", "yyyy-MM-dd HH:mm:ss");
+            queryWrapper.lt("start_time", end);
+            queryWrapper.gt("end_time", start);
+        }
+
+        IPage<TaSignIn> result = iTaSignInService.page(pg, queryWrapper);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 保存对象
+     * @param taSignIn 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sign-in",method= RequestMethod.POST)
+    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+    public ResponseBean taSignInAdd(@ApiParam("保存内容") @RequestBody TaSignIn taSignIn) throws Exception{
+
+        taSignIn.setSignId(null);
+
+        if (StringUtils.isEmpty(taSignIn.getName())) {
+            return ResponseBean.error("请设置签到名称", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        if (iTaSignInService.save(taSignIn)){
+            return ResponseBean.success(taSignIn);
+        }else {
+            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/sign-in/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taSignInDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaSignInService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taSignIn 实体对象
+     * @return
+     */
+    @RequestMapping(value="/admin/sign-in/{id}",method= RequestMethod.PUT)
+    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean taSignInUpdate(@ApiParam("对象ID") @PathVariable String id,
+                                        @ApiParam("更新内容") @RequestBody TaSignIn taSignIn) throws Exception{
+        if (StringUtils.isEmpty(taSignIn.getName())) {
+            return ResponseBean.error("请设置签到名称", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        taSignIn.setSignId(id);
+
+        if (iTaSignInService.updateById(taSignIn)){
+            return ResponseBean.success(iTaSignInService.getById(id));
+        }else {
+            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/{client}/sign-in/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taSignInGet(@ApiParam(value = "客户端",allowableValues = "admin,wx") @PathVariable String client,
+                                    @ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+
+        if ("admin".equals(client)) {
+            TaSignIn taSignIn = iTaSignInService.getExistBy("sign_id", id, false, true);
+            return ResponseBean.success(taSignIn);
+        }
+
+        if ("wx".equals(client)) {
+
+        }
+
+        return ResponseBean.error("不支持的请求", ResponseBean.ERROR_ILLEGAL_PARAMS);
+    }
+}

src/main/java/com/yunzhi/training/controller/TaActivitySignController.java → src/main/java/com/yunzhi/training/controller/TaSignPersonController.java

@@ -16,28 +16,28 @@ 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.training.service.ITaActivitySignService;
-import com.yunzhi.training.entity.TaActivitySign;
+import com.yunzhi.training.service.ITaSignPersonService;
+import com.yunzhi.training.entity.TaSignPerson;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
-    * 签到表 前端控制器
+    * 人员签到表 前端控制器
     * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 
-@Api(tags = "签到表")
+@Api(tags = "人员签到表")
 @RestController
 @RequestMapping("/")
-public class TaActivitySignController extends BaseController {
+public class TaSignPersonController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaActivitySignController.class);
+    private final Logger logger = LoggerFactory.getLogger(TaSignPersonController.class);
 
     @Autowired
-    public ITaActivitySignService iTaActivitySignService;
+    public ITaSignPersonService iTaSignPersonService;
 
 
     /**
@@ -46,30 +46,30 @@ public class TaActivitySignController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taActivitySign",method= RequestMethod.GET)
+    @RequestMapping(value="/taSignPerson",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taActivitySignList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean taSignPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
-		    IPage<TaActivitySign> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaActivitySign> queryWrapper = new QueryWrapper<>();
+		    IPage<TaSignPerson> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaSignPerson> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
-            IPage<TaActivitySign> result = iTaActivitySignService.page(pg, queryWrapper);
+            IPage<TaSignPerson> result = iTaSignPersonService.page(pg, queryWrapper);
             return ResponseBean.success(result);
     }
 
     /**
      * 保存对象
-     * @param taActivitySign 实体对象
+     * @param taSignPerson 实体对象
      * @return
      */
-    @RequestMapping(value="/taActivitySign",method= RequestMethod.POST)
+    @RequestMapping(value="/taSignPerson",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taActivitySignAdd(@ApiParam("保存内容") @RequestBody TaActivitySign taActivitySign) throws Exception{
+    public ResponseBean taSignPersonAdd(@ApiParam("保存内容") @RequestBody TaSignPerson taSignPerson) throws Exception{
 
-        if (iTaActivitySignService.save(taActivitySign)){
-            return ResponseBean.success(taActivitySign);
+        if (iTaSignPersonService.save(taSignPerson)){
+            return ResponseBean.success(taSignPerson);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -79,10 +79,10 @@ public class TaActivitySignController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taActivitySign/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/taSignPerson/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taActivitySignDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaActivitySignService.removeById(id)){
+    public ResponseBean taSignPersonDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iTaSignPersonService.removeById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -92,16 +92,16 @@ public class TaActivitySignController extends BaseController {
     /**
      * 修改对象
      * @param id  实体ID
-     * @param taActivitySign 实体对象
+     * @param taSignPerson 实体对象
      * @return
      */
-    @RequestMapping(value="/taActivitySign/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/taSignPerson/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taActivitySignUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaActivitySign taActivitySign) throws Exception{
+    public ResponseBean taSignPersonUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody TaSignPerson taSignPerson) throws Exception{
 
-        if (iTaActivitySignService.updateById(taActivitySign)){
-            return ResponseBean.success(iTaActivitySignService.getById(id));
+        if (iTaSignPersonService.updateById(taSignPerson)){
+            return ResponseBean.success(iTaSignPersonService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -111,9 +111,9 @@ public class TaActivitySignController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taActivitySign/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/taSignPerson/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taActivitySignGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaActivitySignService.getById(id));
+    public ResponseBean taSignPersonGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iTaSignPersonService.getById(id));
     }
 }

src/main/java/com/yunzhi/training/controller/TaActivityController.java → src/main/java/com/yunzhi/training/controller/TaSignPlainController.java

@@ -16,28 +16,28 @@ 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.training.service.ITaActivityService;
-import com.yunzhi.training.entity.TaActivity;
+import com.yunzhi.training.service.ITaSignPlainService;
+import com.yunzhi.training.entity.TaSignPlain;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
-    * 活动表 前端控制器
+    * 预签到人员 前端控制器
     * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 
-@Api(tags = "活动表")
+@Api(tags = "预签到人员")
 @RestController
 @RequestMapping("/")
-public class TaActivityController extends BaseController {
+public class TaSignPlainController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(TaActivityController.class);
+    private final Logger logger = LoggerFactory.getLogger(TaSignPlainController.class);
 
     @Autowired
-    public ITaActivityService iTaActivityService;
+    public ITaSignPlainService iTaSignPlainService;
 
 
     /**
@@ -46,30 +46,30 @@ public class TaActivityController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taActivity",method= RequestMethod.GET)
+    @RequestMapping(value="/taSignPlain",method= RequestMethod.GET)
     @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taActivityList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+    public ResponseBean taSignPlainList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
 									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize) throws Exception{
 
-		    IPage<TaActivity> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaActivity> queryWrapper = new QueryWrapper<>();
+		    IPage<TaSignPlain> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaSignPlain> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
-            IPage<TaActivity> result = iTaActivityService.page(pg, queryWrapper);
+            IPage<TaSignPlain> result = iTaSignPlainService.page(pg, queryWrapper);
             return ResponseBean.success(result);
     }
 
     /**
      * 保存对象
-     * @param taActivity 实体对象
+     * @param taSignPlain 实体对象
      * @return
      */
-    @RequestMapping(value="/taActivity",method= RequestMethod.POST)
+    @RequestMapping(value="/taSignPlain",method= RequestMethod.POST)
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
-    public ResponseBean taActivityAdd(@ApiParam("保存内容") @RequestBody TaActivity taActivity) throws Exception{
+    public ResponseBean taSignPlainAdd(@ApiParam("保存内容") @RequestBody TaSignPlain taSignPlain) throws Exception{
 
-        if (iTaActivityService.save(taActivity)){
-            return ResponseBean.success(taActivity);
+        if (iTaSignPlainService.save(taSignPlain)){
+            return ResponseBean.success(taSignPlain);
         }else {
             return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -79,10 +79,10 @@ public class TaActivityController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taActivity/{id}", method= RequestMethod.DELETE)
+    @RequestMapping(value="/taSignPlain/{id}", method= RequestMethod.DELETE)
     @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
-    public ResponseBean taActivityDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        if(iTaActivityService.removeById(id)){
+    public ResponseBean taSignPlainDelete(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        if(iTaSignPlainService.removeById(id)){
             return ResponseBean.success("success");
         }else {
             return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
@@ -92,16 +92,16 @@ public class TaActivityController extends BaseController {
     /**
      * 修改对象
      * @param id  实体ID
-     * @param taActivity 实体对象
+     * @param taSignPlain 实体对象
      * @return
      */
-    @RequestMapping(value="/taActivity/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value="/taSignPlain/{id}",method= RequestMethod.PUT)
     @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
-    public ResponseBean taActivityUpdate(@ApiParam("对象ID") @PathVariable Integer id,
-                                        @ApiParam("更新内容") @RequestBody TaActivity taActivity) throws Exception{
+    public ResponseBean taSignPlainUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+                                        @ApiParam("更新内容") @RequestBody TaSignPlain taSignPlain) throws Exception{
 
-        if (iTaActivityService.updateById(taActivity)){
-            return ResponseBean.success(iTaActivityService.getById(id));
+        if (iTaSignPlainService.updateById(taSignPlain)){
+            return ResponseBean.success(iTaSignPlainService.getById(id));
         }else {
             return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -111,9 +111,9 @@ public class TaActivityController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @RequestMapping(value="/taActivity/{id}",method= RequestMethod.GET)
+    @RequestMapping(value="/taSignPlain/{id}",method= RequestMethod.GET)
     @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taActivityGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
-        return ResponseBean.success(iTaActivityService.getById(id));
+    public ResponseBean taSignPlainGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iTaSignPlainService.getById(id));
     }
 }

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

@@ -0,0 +1,136 @@
+package com.yunzhi.training.controller;
+
+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.training.common.BaseController;
+import com.yunzhi.training.common.ResponseBean;
+import com.yunzhi.training.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 com.yunzhi.training.service.ITaStudentService;
+import com.yunzhi.training.entity.TaStudent;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+    * 学员表 前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+
+@Api(tags = "学员表")
+@RestController
+@RequestMapping("/")
+public class TaStudentController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaStudentController.class);
+
+    @Autowired
+    public ITaStudentService iTaStudentService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/student",method= RequestMethod.GET)
+    @ApiOperation(value="列表", notes = "列表", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taStudentList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                      @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                      @ApiParam("学期") @RequestParam(value ="termId", required = false) String termId,
+                                      @ApiParam("班级") @RequestParam(value ="classId", required = false) String classId,
+                                      @ApiParam("姓名") @RequestParam(value ="name", required = false) String name,
+                                      @ApiParam("手机号") @RequestParam(value ="phone", required = false) String phone) throws Exception{
+
+        IPage<TaStudent> pg = new Page<>(pageNum, pageSize);
+
+        IPage<TaStudent> result = iTaStudentService.getPageBy(pg, termId, classId, name, phone);
+        return ResponseBean.success(result);
+    }
+
+//    /**
+//     * 保存对象
+//     * @param taStudent 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taStudent",method= RequestMethod.POST)
+//    @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
+//    public ResponseBean taStudentAdd(@ApiParam("保存内容") @RequestBody TaStudent taStudent) throws Exception{
+//
+//        if (iTaStudentService.save(taStudent)){
+//            return ResponseBean.success(taStudent);
+//        }else {
+//            return ResponseBean.error("保存失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/student/{id}", method= RequestMethod.DELETE)
+    @ApiOperation(value="删除", notes = "删除", httpMethod = "DELETE", response = ResponseBean.class)
+    public ResponseBean taStudentDelete(@ApiParam("对象ID") @PathVariable String id) throws Exception{
+        if(iTaStudentService.removeLogicById(id)){
+            return ResponseBean.success("success");
+        }else {
+            return ResponseBean.error("删除失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+//    /**
+//     * 修改对象
+//     * @param id  实体ID
+//     * @param taStudent 实体对象
+//     * @return
+//     */
+//    @RequestMapping(value="/taStudent/{id}",method= RequestMethod.PUT)
+//    @ApiOperation(value="更新", notes = "更新", httpMethod = "PUT", response = ResponseBean.class)
+//    public ResponseBean taStudentUpdate(@ApiParam("对象ID") @PathVariable Integer id,
+//                                        @ApiParam("更新内容") @RequestBody TaStudent taStudent) throws Exception{
+//
+//        if (iTaStudentService.updateById(taStudent)){
+//            return ResponseBean.success(iTaStudentService.getById(id));
+//        }else {
+//            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
+//        }
+//    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/student/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="详情", notes = "详情", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean taStudentGet(@ApiParam("对象ID") @PathVariable Integer id) throws Exception{
+        return ResponseBean.success(iTaStudentService.getExistBy("student_id", id, false, true));
+    }
+
+    /**
+     * 根据id查询对象
+     */
+    @RequestMapping(value="/wx/student/current",method= RequestMethod.GET)
+    @ApiOperation(value="当前人", notes = "当前人", httpMethod = "GET", response = ResponseBean.class)
+    public ResponseBean wxStudentGet(HttpServletRequest request) throws Exception{
+        TaPerson taPerson = getCurrentPerson(request);
+        TaStudent student = iTaStudentService.getExistBy("person_id", taPerson.getPersonId(), false, true);
+
+        return ResponseBean.success(student);
+    }
+}

src/main/java/com/yunzhi/training/entity/TaAnswer.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/yunzhi/training/entity/TaAttachment.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/yunzhi/training/entity/TaBanner.java

@@ -0,0 +1,55 @@
+package com.yunzhi.training.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * Banner表
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaBanner对象", description="Banner表")
+public class TaBanner implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "BannerID")
+    @TableId(value = "banner_id", type = IdType.UUID)
+    private String bannerId;
+
+    @ApiModelProperty(value = "课程ID")
+    private String courseId;
+
+    @ApiModelProperty(value = "名称")
+    private String title;
+
+    @ApiModelProperty(value = "图片")
+    private String thumb;
+
+    @ApiModelProperty(value = "位置")
+    private String position;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sortNo;
+
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/training/entity/TaCourse.java

@@ -0,0 +1,55 @@
+package com.yunzhi.training.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 课程表
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaCourse对象", description="课程表")
+public class TaCourse implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "课程ID")
+    @TableId(value = "course_id", type = IdType.UUID)
+    private String courseId;
+
+    @ApiModelProperty(value = "课程名称")
+    private String title;
+
+    @ApiModelProperty(value = "课程简介")
+    private String subTitle;
+
+    @ApiModelProperty(value = "开始时间")
+    private LocalDateTime startDate;
+
+    @ApiModelProperty(value = "结束时间")
+    private LocalDateTime endDate;
+
+    @ApiModelProperty(value = "课程内容")
+    private String content;
+
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

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

@@ -2,6 +2,8 @@ package com.yunzhi.training.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;
@@ -16,7 +18,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -27,7 +29,7 @@ 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")
@@ -51,5 +53,15 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "所属学期")
+    private String termId;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "班级ID")
+    private String classId;
 
+    @TableField(exist = false)
+    @ApiModelProperty(value = "验证码")
+    private String captcha;
 }

src/main/java/com/yunzhi/training/entity/TaQuePerson.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/yunzhi/training/entity/TaQuestion.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/yunzhi/training/entity/TaQuestionPerson.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/yunzhi/training/entity/TaQuestionnaire.java

@@ -16,7 +16,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)

src/main/java/com/yunzhi/training/entity/TaSchoolClass.java

@@ -0,0 +1,50 @@
+package com.yunzhi.training.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;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 班级
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaSchoolClass对象", description="班级")
+public class TaSchoolClass implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "班级ID")
+    @TableId(value = "class_id", type = IdType.UUID)
+    private String classId;
+
+    @ApiModelProperty(value = "所属学期")
+    private String termId;
+
+    @ApiModelProperty(value = "班级名称")
+    private String name;
+
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "所属学期名称")
+    private String termName;
+}

src/main/java/com/yunzhi/training/entity/TaActivitySign.java → src/main/java/com/yunzhi/training/entity/TaSchoolTerm.java

@@ -1,8 +1,8 @@
 package com.yunzhi.training.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -12,29 +12,29 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 签到表
+ * 学期
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="TaActivitySign对象", description="签到表")
-public class TaActivitySign implements Serializable {
+@ApiModel(value="TaSchoolTerm对象", description="学期")
+public class TaSchoolTerm implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "签到ID")
-    @TableId(value = "sign_id", type = IdType.AUTO)
-    private Integer signId;
+    @ApiModelProperty(value = "学期ID")
+    @TableId(value = "term_id", type = IdType.UUID)
+    private String termId;
 
-    @ApiModelProperty(value = "人员ID")
-    private String personId;
+    @ApiModelProperty(value = "学期名称")
+    private String name;
 
-    @ApiModelProperty(value = "活动ID")
-    private String activityId;
+    @ApiModelProperty(value = "状态")
+    private Integer state;
 
     @ApiModelProperty(value = "创建时间")
     private LocalDateTime createDate;

src/main/java/com/yunzhi/training/entity/TaActivity.java → src/main/java/com/yunzhi/training/entity/TaSignIn.java

@@ -12,25 +12,25 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 活动表
+ * 签到主表
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@ApiModel(value="TaActivity对象", description="活动表")
-public class TaActivity implements Serializable {
+@ApiModel(value="TaSignIn对象", description="签到主表")
+public class TaSignIn implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "课程ID")
-    @TableId(value = "activity_id", type = IdType.INPUT)
-    private String activityId;
+    @ApiModelProperty(value = "签到ID")
+    @TableId(value = "sign_id", type = IdType.UUID)
+    private String signId;
 
-    @ApiModelProperty(value = "名称")
+    @ApiModelProperty(value = "签到名称")
     private String name;
 
     @ApiModelProperty(value = "计划人数")

src/main/java/com/yunzhi/training/entity/TaSignPerson.java

@@ -0,0 +1,52 @@
+package com.yunzhi.training.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 人员签到表
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaSignPerson对象", description="人员签到表")
+public class TaSignPerson implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "签到ID")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "签到ID")
+    private String signId;
+
+    @ApiModelProperty(value = "学员ID")
+    private String studentId;
+
+    @ApiModelProperty(value = "学期ID")
+    private String termId;
+
+    @ApiModelProperty(value = "班级ID")
+    private String classId;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+
+}

src/main/java/com/yunzhi/training/entity/TaSignPlain.java

@@ -0,0 +1,50 @@
+package com.yunzhi.training.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 预签到人员
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaSignPlain对象", description="预签到人员")
+public class TaSignPlain implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "序号")
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    @ApiModelProperty(value = "签到ID")
+    private String signId;
+
+    @ApiModelProperty(value = "人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "学员ID")
+    private String studentId;
+
+    @ApiModelProperty(value = "学期ID")
+    private String termId;
+
+    @ApiModelProperty(value = "班级ID")
+    private String classId;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+}

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

@@ -0,0 +1,67 @@
+package com.yunzhi.training.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;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 学员表
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="TaStudent对象", description="学员表")
+public class TaStudent implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "学员ID")
+    @TableId(value = "student_id", type = IdType.UUID)
+    private String studentId;
+
+    @ApiModelProperty(value = "对应人员")
+    private String personId;
+
+    @ApiModelProperty(value = "所属学期")
+    private String termId;
+
+    @ApiModelProperty(value = "班级ID")
+    private String classId;
+
+    @ApiModelProperty(value = "名称")
+    private String name;
+
+    @ApiModelProperty(value = "性别")
+    private Integer sex;
+
+    @ApiModelProperty(value = "手机号")
+    private String phone;
+
+    @ApiModelProperty(value = "状态")
+    private Integer state;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "学期名称")
+    private String termName;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "班级名称")
+    private String className;
+
+}

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

@@ -23,6 +23,7 @@ public class PermissionInterceptor implements HandlerInterceptor {
         try {
             JWTUtils.verify(token);
         } catch (Exception e) {
+            e.printStackTrace();
             log.error("鉴权失败: {}", e.getMessage());
             responseTokenError(response, "鉴权失败, 请重新登录");
             return false;

src/main/java/com/yunzhi/training/mapper/TaAnswerMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Mapper
 public interface TaAnswerMapper extends BaseMapper<TaAnswer> {

src/main/java/com/yunzhi/training/mapper/TaAttachmentMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Mapper
 public interface TaAttachmentMapper extends BaseMapper<TaAttachment> {

src/main/java/com/yunzhi/training/mapper/TaActivityMapper.java → src/main/java/com/yunzhi/training/mapper/TaBannerMapper.java

@@ -1,18 +1,18 @@
 package com.yunzhi.training.mapper;
 
-import com.yunzhi.training.entity.TaActivity;
+import com.yunzhi.training.entity.TaBanner;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- * 活动表 Mapper 接口
+ * Banner表 Mapper 接口
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Mapper
-public interface TaActivityMapper extends BaseMapper<TaActivity> {
+public interface TaBannerMapper extends BaseMapper<TaBanner> {
 
 }

src/main/java/com/yunzhi/training/mapper/TaCourseMapper.java

@@ -0,0 +1,27 @@
+package com.yunzhi.training.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.entity.TaCourse;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 课程表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Mapper
+public interface TaCourseMapper extends BaseMapper<TaCourse> {
+
+    IPage<TaCourse> getPagedBy(IPage<TaCourse> pg,
+                               @Param("client") String client,
+                               @Param("title") String title,
+                               @Param("start") LocalDateTime start,
+                               @Param("end") LocalDateTime end);
+}

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

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Mapper
 public interface TaPersonMapper extends BaseMapper<TaPerson> {

src/main/java/com/yunzhi/training/mapper/TaQuePersonMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Mapper
 public interface TaQuePersonMapper extends BaseMapper<TaQuePerson> {

src/main/java/com/yunzhi/training/mapper/TaQuestionMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Mapper
 public interface TaQuestionMapper extends BaseMapper<TaQuestion> {

src/main/java/com/yunzhi/training/mapper/TaQuestionPersonMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Mapper
 public interface TaQuestionPersonMapper extends BaseMapper<TaQuestionPerson> {

src/main/java/com/yunzhi/training/mapper/TaQuestionnaireMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Mapper
 public interface TaQuestionnaireMapper extends BaseMapper<TaQuestionnaire> {

src/main/java/com/yunzhi/training/mapper/TaSchoolClassMapper.java

@@ -0,0 +1,24 @@
+package com.yunzhi.training.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.entity.TaSchoolClass;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 班级 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Mapper
+public interface TaSchoolClassMapper extends BaseMapper<TaSchoolClass> {
+
+    IPage<TaSchoolClass> getPageBy(IPage<TaSchoolClass> pg,
+                                   @Param("termId") String termId,
+                                   @Param("name") String name,
+                                   @Param("client") String client);
+}

src/main/java/com/yunzhi/training/mapper/TaActivitySignMapper.java → src/main/java/com/yunzhi/training/mapper/TaSchoolTermMapper.java

@@ -1,18 +1,18 @@
 package com.yunzhi.training.mapper;
 
-import com.yunzhi.training.entity.TaActivitySign;
+import com.yunzhi.training.entity.TaSchoolTerm;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
- * 签到表 Mapper 接口
+ * 学期 Mapper 接口
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Mapper
-public interface TaActivitySignMapper extends BaseMapper<TaActivitySign> {
+public interface TaSchoolTermMapper extends BaseMapper<TaSchoolTerm> {
 
 }

src/main/java/com/yunzhi/training/mapper/TaSignInMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.training.mapper;
+
+import com.yunzhi.training.entity.TaSignIn;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 签到主表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Mapper
+public interface TaSignInMapper extends BaseMapper<TaSignIn> {
+
+}

src/main/java/com/yunzhi/training/mapper/TaSignPersonMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.training.mapper;
+
+import com.yunzhi.training.entity.TaSignPerson;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 人员签到表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Mapper
+public interface TaSignPersonMapper extends BaseMapper<TaSignPerson> {
+
+}

src/main/java/com/yunzhi/training/mapper/TaSignPlainMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.training.mapper;
+
+import com.yunzhi.training.entity.TaSignPlain;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 预签到人员 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Mapper
+public interface TaSignPlainMapper extends BaseMapper<TaSignPlain> {
+
+}

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

@@ -0,0 +1,25 @@
+package com.yunzhi.training.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.entity.TaStudent;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 学员表 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Mapper
+public interface TaStudentMapper extends BaseMapper<TaStudent> {
+
+    IPage<TaStudent> getPageBy(IPage<TaStudent> pg,
+                               @Param("termId") String termId,
+                               @Param("classId") String classId,
+                               @Param("name") String name,
+                               @Param("phone") String phone);
+}

src/main/java/com/yunzhi/training/service/IBaseService.java

@@ -11,4 +11,10 @@ public interface IBaseService <T> extends IService<T> {
      * @return
      */
     boolean removeLogicById(Serializable id);
+
+    int countBy(String column, Object value, boolean notDelete);
+
+    T getByButNot(String column, Object value, String col, Object val, boolean notDelete);
+
+    T getExistBy(String column, Object value, boolean normal, boolean notDelete);
 }

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

@@ -1,16 +0,0 @@
-package com.yunzhi.training.service;
-
-import com.yunzhi.training.entity.TaActivity;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 活动表 服务类
- * </p>
- *
- * @author yansen
- * @since 2022-02-18
- */
-public interface ITaActivityService extends IService<TaActivity> {
-
-}

src/main/java/com/yunzhi/training/service/ITaActivitySignService.java

@@ -1,16 +0,0 @@
-package com.yunzhi.training.service;
-
-import com.yunzhi.training.entity.TaActivitySign;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 签到表 服务类
- * </p>
- *
- * @author yansen
- * @since 2022-02-18
- */
-public interface ITaActivitySignService extends IService<TaActivitySign> {
-
-}

src/main/java/com/yunzhi/training/service/ITaAnswerService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 public interface ITaAnswerService extends IService<TaAnswer> {
 

src/main/java/com/yunzhi/training/service/ITaAttachmentService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 public interface ITaAttachmentService extends IService<TaAttachment> {
 

src/main/java/com/yunzhi/training/service/ITaBannerService.java

@@ -0,0 +1,15 @@
+package com.yunzhi.training.service;
+
+import com.yunzhi.training.entity.TaBanner;
+
+/**
+ * <p>
+ * Banner表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+public interface ITaBannerService extends IBaseService<TaBanner> {
+
+}

src/main/java/com/yunzhi/training/service/ITaCourseService.java

@@ -0,0 +1,19 @@
+package com.yunzhi.training.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.entity.TaCourse;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 课程表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+public interface ITaCourseService extends IBaseService<TaCourse> {
+
+    IPage<TaCourse> getPagedBy(IPage<TaCourse> pg, String client, String title, LocalDateTime start, LocalDateTime end);
+}

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

@@ -9,8 +9,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 public interface ITaPersonService extends IService<TaPerson> {
 
+    TaPerson getByOpenID(String openID);
 }

src/main/java/com/yunzhi/training/service/ITaQuePersonService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 public interface ITaQuePersonService extends IService<TaQuePerson> {
 

src/main/java/com/yunzhi/training/service/ITaQuestionPersonService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 public interface ITaQuestionPersonService extends IService<TaQuestionPerson> {
 

src/main/java/com/yunzhi/training/service/ITaQuestionService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 public interface ITaQuestionService extends IService<TaQuestion> {
 

src/main/java/com/yunzhi/training/service/ITaQuestionnaireService.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 public interface ITaQuestionnaireService extends IService<TaQuestionnaire> {
 

src/main/java/com/yunzhi/training/service/ITaSchoolClassService.java

@@ -0,0 +1,21 @@
+package com.yunzhi.training.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.entity.TaSchoolClass;
+
+/**
+ * <p>
+ * 班级 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+public interface ITaSchoolClassService extends IBaseService<TaSchoolClass> {
+
+    int countName(String termId, String name);
+
+    boolean checkOnly(TaSchoolClass taSchoolClass);
+
+    IPage<TaSchoolClass> getPageBy(IPage<TaSchoolClass> pg, String termId, String name, String client);
+}

src/main/java/com/yunzhi/training/service/ITaSchoolTermService.java

@@ -0,0 +1,15 @@
+package com.yunzhi.training.service;
+
+import com.yunzhi.training.entity.TaSchoolTerm;
+
+/**
+ * <p>
+ * 学期 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+public interface ITaSchoolTermService extends IBaseService<TaSchoolTerm> {
+
+}

src/main/java/com/yunzhi/training/service/ITaSignInService.java

@@ -0,0 +1,15 @@
+package com.yunzhi.training.service;
+
+import com.yunzhi.training.entity.TaSignIn;
+
+/**
+ * <p>
+ * 签到主表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+public interface ITaSignInService extends IBaseService<TaSignIn> {
+
+}

src/main/java/com/yunzhi/training/service/ITaSignPersonService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.training.service;
+
+import com.yunzhi.training.entity.TaSignPerson;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 人员签到表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+public interface ITaSignPersonService extends IService<TaSignPerson> {
+
+}

src/main/java/com/yunzhi/training/service/ITaSignPlainService.java

@@ -0,0 +1,16 @@
+package com.yunzhi.training.service;
+
+import com.yunzhi.training.entity.TaSignPlain;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 预签到人员 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+public interface ITaSignPlainService extends IService<TaSignPlain> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.yunzhi.training.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.entity.TaStudent;
+
+/**
+ * <p>
+ * 学员表 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+public interface ITaStudentService extends IBaseService<TaStudent> {
+
+    IPage<TaStudent> getPageBy(IPage<TaStudent> pg, String termId, String classId, String name, String phone);
+}

src/main/java/com/yunzhi/training/service/impl/BaseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.yunzhi.training.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.TableInfo;
@@ -15,9 +16,39 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T> extends ServiceImpl<M,
 
         TableInfo tableInfo = SqlHelper.table(currentModelClass());
         UpdateWrapper<T> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("status", -1)
+        updateWrapper.set("state", -1)
                 .eq(tableInfo.getKeyColumn(), id);
 
         return update(updateWrapper);
     }
+
+    @Override
+    public int countBy(String column, Object value, boolean notDelete) {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(column, value);
+        queryWrapper.gt(notDelete, "state", -1);
+
+        return count(queryWrapper);
+    }
+
+    @Override
+    public T getByButNot(String column, Object value, String col, Object val, boolean notDelete) {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(column, value);
+        queryWrapper.ne(col, val);
+        queryWrapper.gt(notDelete, "state", -1);
+        queryWrapper.last("limit 1");
+
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public T getExistBy(String column, Object value, boolean normal, boolean notDelete) {
+        QueryWrapper<T> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq(column, value);
+        queryWrapper.eq(normal, "state", 1);
+        queryWrapper.gt(notDelete, "state", -1);
+        queryWrapper.last("limit 1");
+        return getOne(queryWrapper);
+    }
 }

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

@@ -1,20 +0,0 @@
-package com.yunzhi.training.service.impl;
-
-import com.yunzhi.training.entity.TaActivity;
-import com.yunzhi.training.mapper.TaActivityMapper;
-import com.yunzhi.training.service.ITaActivityService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 活动表 服务实现类
- * </p>
- *
- * @author yansen
- * @since 2022-02-18
- */
-@Service
-public class TaActivityServiceImpl extends ServiceImpl<TaActivityMapper, TaActivity> implements ITaActivityService {
-
-}

src/main/java/com/yunzhi/training/service/impl/TaActivitySignServiceImpl.java

@@ -1,20 +0,0 @@
-package com.yunzhi.training.service.impl;
-
-import com.yunzhi.training.entity.TaActivitySign;
-import com.yunzhi.training.mapper.TaActivitySignMapper;
-import com.yunzhi.training.service.ITaActivitySignService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 签到表 服务实现类
- * </p>
- *
- * @author yansen
- * @since 2022-02-18
- */
-@Service
-public class TaActivitySignServiceImpl extends ServiceImpl<TaActivitySignMapper, TaActivitySign> implements ITaActivitySignService {
-
-}

src/main/java/com/yunzhi/training/service/impl/TaAnswerServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Service
 public class TaAnswerServiceImpl extends ServiceImpl<TaAnswerMapper, TaAnswer> implements ITaAnswerService {

src/main/java/com/yunzhi/training/service/impl/TaAttachmentServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Service
 public class TaAttachmentServiceImpl extends ServiceImpl<TaAttachmentMapper, TaAttachment> implements ITaAttachmentService {

src/main/java/com/yunzhi/training/service/impl/TaBannerServiceImpl.java

@@ -0,0 +1,19 @@
+package com.yunzhi.training.service.impl;
+
+import com.yunzhi.training.entity.TaBanner;
+import com.yunzhi.training.mapper.TaBannerMapper;
+import com.yunzhi.training.service.ITaBannerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * Banner表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Service
+public class TaBannerServiceImpl extends BaseServiceImpl<TaBannerMapper, TaBanner> implements ITaBannerService {
+
+}

src/main/java/com/yunzhi/training/service/impl/TaCourseServiceImpl.java

@@ -0,0 +1,26 @@
+package com.yunzhi.training.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.entity.TaCourse;
+import com.yunzhi.training.mapper.TaCourseMapper;
+import com.yunzhi.training.service.ITaCourseService;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 课程表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Service
+public class TaCourseServiceImpl extends BaseServiceImpl<TaCourseMapper, TaCourse> implements ITaCourseService {
+
+    @Override
+    public IPage<TaCourse> getPagedBy(IPage<TaCourse> pg, String client, String title, LocalDateTime start, LocalDateTime end) {
+        return baseMapper.getPagedBy(pg, client, title, start, end);
+    }
+}

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

@@ -1,5 +1,7 @@
 package com.yunzhi.training.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yunzhi.training.common.Constants;
 import com.yunzhi.training.entity.TaPerson;
 import com.yunzhi.training.mapper.TaPersonMapper;
 import com.yunzhi.training.service.ITaPersonService;
@@ -12,9 +14,17 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Service
 public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
+    @Override
+    public TaPerson getByOpenID(String openID) {
+        QueryWrapper<TaPerson> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("openid", openID);
+        queryWrapper.gt("state", Constants.STATUS_DELETED);
+
+        return getOne(queryWrapper);
+    }
 }

src/main/java/com/yunzhi/training/service/impl/TaQuePersonServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Service
 public class TaQuePersonServiceImpl extends ServiceImpl<TaQuePersonMapper, TaQuePerson> implements ITaQuePersonService {

src/main/java/com/yunzhi/training/service/impl/TaQuestionPersonServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Service
 public class TaQuestionPersonServiceImpl extends ServiceImpl<TaQuestionPersonMapper, TaQuestionPerson> implements ITaQuestionPersonService {

src/main/java/com/yunzhi/training/service/impl/TaQuestionServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Service
 public class TaQuestionServiceImpl extends ServiceImpl<TaQuestionMapper, TaQuestion> implements ITaQuestionService {

src/main/java/com/yunzhi/training/service/impl/TaQuestionnaireServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author yansen
- * @since 2022-02-18
+ * @since 2022-02-21
  */
 @Service
 public class TaQuestionnaireServiceImpl extends ServiceImpl<TaQuestionnaireMapper, TaQuestionnaire> implements ITaQuestionnaireService {

src/main/java/com/yunzhi/training/service/impl/TaSchoolClassServiceImpl.java

@@ -0,0 +1,46 @@
+package com.yunzhi.training.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.entity.TaSchoolClass;
+import com.yunzhi.training.mapper.TaSchoolClassMapper;
+import com.yunzhi.training.service.ITaSchoolClassService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 班级 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Service
+public class TaSchoolClassServiceImpl extends BaseServiceImpl<TaSchoolClassMapper, TaSchoolClass> implements ITaSchoolClassService {
+
+    @Override
+    public int countName(String termId, String name) {
+        QueryWrapper<TaSchoolClass> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("term_id", termId);
+        queryWrapper.eq("name", name);
+        queryWrapper.gt("state", -1);
+
+        return count(queryWrapper);
+    }
+
+    @Override
+    public boolean checkOnly(TaSchoolClass taSchoolClass) {
+        QueryWrapper<TaSchoolClass> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("term_id", taSchoolClass.getTermId());
+        queryWrapper.eq("name", taSchoolClass.getName());
+        queryWrapper.ne("class_id", taSchoolClass.getClassId());
+        queryWrapper.gt("state", -1);
+
+        return count(queryWrapper) < 1;
+    }
+
+    @Override
+    public IPage<TaSchoolClass> getPageBy(IPage<TaSchoolClass> pg, String termId, String name, String client) {
+        return baseMapper.getPageBy(pg, termId, name, client);
+    }
+}

src/main/java/com/yunzhi/training/service/impl/TaSchoolTermServiceImpl.java

@@ -0,0 +1,19 @@
+package com.yunzhi.training.service.impl;
+
+import com.yunzhi.training.entity.TaSchoolTerm;
+import com.yunzhi.training.mapper.TaSchoolTermMapper;
+import com.yunzhi.training.service.ITaSchoolTermService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 学期 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Service
+public class TaSchoolTermServiceImpl extends BaseServiceImpl<TaSchoolTermMapper, TaSchoolTerm> implements ITaSchoolTermService {
+
+}

src/main/java/com/yunzhi/training/service/impl/TaSignInServiceImpl.java

@@ -0,0 +1,19 @@
+package com.yunzhi.training.service.impl;
+
+import com.yunzhi.training.entity.TaSignIn;
+import com.yunzhi.training.mapper.TaSignInMapper;
+import com.yunzhi.training.service.ITaSignInService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 签到主表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Service
+public class TaSignInServiceImpl extends BaseServiceImpl<TaSignInMapper, TaSignIn> implements ITaSignInService {
+
+}

src/main/java/com/yunzhi/training/service/impl/TaSignPersonServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.training.service.impl;
+
+import com.yunzhi.training.entity.TaSignPerson;
+import com.yunzhi.training.mapper.TaSignPersonMapper;
+import com.yunzhi.training.service.ITaSignPersonService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 人员签到表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Service
+public class TaSignPersonServiceImpl extends ServiceImpl<TaSignPersonMapper, TaSignPerson> implements ITaSignPersonService {
+
+}

src/main/java/com/yunzhi/training/service/impl/TaSignPlainServiceImpl.java

@@ -0,0 +1,20 @@
+package com.yunzhi.training.service.impl;
+
+import com.yunzhi.training.entity.TaSignPlain;
+import com.yunzhi.training.mapper.TaSignPlainMapper;
+import com.yunzhi.training.service.ITaSignPlainService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 预签到人员 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Service
+public class TaSignPlainServiceImpl extends ServiceImpl<TaSignPlainMapper, TaSignPlain> implements ITaSignPlainService {
+
+}

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

@@ -0,0 +1,24 @@
+package com.yunzhi.training.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.training.entity.TaStudent;
+import com.yunzhi.training.mapper.TaStudentMapper;
+import com.yunzhi.training.service.ITaStudentService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 学员表 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2022-02-21
+ */
+@Service
+public class TaStudentServiceImpl extends BaseServiceImpl<TaStudentMapper, TaStudent> implements ITaStudentService {
+
+    @Override
+    public IPage<TaStudent> getPageBy(IPage<TaStudent> pg, String termId, String classId, String name, String phone) {
+        return baseMapper.getPageBy(pg, termId, classId, name, phone);
+    }
+}

src/main/java/com/yunzhi/training/vo/TokenParam.java

@@ -23,9 +23,6 @@ public class TokenParam {
     @ApiModelProperty("原始值")
     String raw;
 
-    @ApiModelProperty("有效期")
-    Date exp;
-
     public static TokenParam fromMap(Map<String, Object> mapParams) {
         TokenParam tokenParam = new TokenParam();
 
@@ -33,11 +30,9 @@ public class TokenParam {
         Object u = mapParams.get("userId");
         Object o = mapParams.get("orgId");
         Object r = mapParams.get("raw");
-        Object e = mapParams.get("exp");
         tokenParam.setUserId(null == u ? null : u.toString());
         tokenParam.setOrgId(null == o ? null : o.toString());
         tokenParam.setRaw(null == r ? null : r.toString());
-        tokenParam.setExp(null == r ? null : (Date) r);
 
         return tokenParam;
     }

src/main/resources/application.yml

@@ -29,19 +29,24 @@ aliyun:
   accessKeyId: LTAI5tGjnZY6k799BHxhmqcm
   accessKeySecret: eU1DmULbgHe2dnIg3P93634PO2vEh5
   oss:
-    roleSessionName: shigongli
+    roleSessionName: grid-training
     accessKeyId: LTAI4G9zCefU1m7sKmmBnzTc
     accessKeySecret: Vaax5O7wTL0KZdSgd8L9cGBf8AgUqJ
     arn: acs:ram::1636896505560465:role/ramosssts
     region: oss-cn-shanghai
-    endpoint: oss-accelerate.aliyuncs.com
-    bucketName: yz-shigongli
-    bucketURL: https://yz-shigongli.oss-accelerate.aliyuncs.com
+    endpoint: oss-cn-shanghai.aliyuncs.com
+    bucketName: yz-grid-training
+    bucketURL: https://yz-grid-training.oss-cn-shanghai.aliyuncs.com
   sms:
     captcha:
       code: SMS_195585471
       sign: 云致
 
+###
+yz:
+  mp:
+    openidAPI: https://api.h5.njyunzhi.com/mp/openid?code=%s
+
 ###
 spring:
   application:

src/main/resources/mapper/TaActivityMapper.xml → src/main/resources/mapper/TaBannerMapper.xml

@@ -1,5 +1,5 @@
 <?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.training.mapper.TaActivityMapper">
+<mapper namespace="com.yunzhi.training.mapper.TaBannerMapper">
 
 </mapper>

src/main/resources/mapper/TaCourseMapper.xml

@@ -0,0 +1,24 @@
+<?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.training.mapper.TaCourseMapper">
+
+    <select id="getPagedBy" resultType="com.yunzhi.training.entity.TaCourse">
+        SELECT
+            *
+        FROM
+            ta_course t
+        WHERE
+            t.state &gt; - 1
+          <if test="client != null and client != ''">
+              AND t.state = 1
+          </if>
+        <if test="title != null and title != ''">
+            AND t.title LIKE CONCAT( '%', #{title}, '%' )
+        </if>
+        <if test="start != null">
+            AND t.start_date &lt; #{end}
+            AND t.end_date &gt; #{start}
+        </if>
+          ORDER BY t.create_date DESC
+    </select>
+</mapper>

src/main/resources/mapper/TaSchoolClassMapper.xml

@@ -0,0 +1,25 @@
+<?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.training.mapper.TaSchoolClassMapper">
+
+    <select id="getPageBy" resultType="com.yunzhi.training.entity.TaSchoolClass">
+        SELECT
+            t.*,
+            s.`name` AS term_name
+        FROM
+            ta_school_class t
+                INNER JOIN ta_school_term s ON s.term_id = t.term_id
+        WHERE
+            t.state > - 1
+          <if test="client == 'wx'">
+              AND t.state = 1
+          </if>
+          <if test="name != null and name != ''">
+              AND t.`name` LIKE CONCAT( '%', #{name}, '%' )
+          </if>
+          <if test="termId != null and termId != ''">
+              AND t.term_id = #{termId}
+          </if>
+            ORDER BY t.name ASC
+    </select>
+</mapper>

src/main/resources/mapper/TaActivitySignMapper.xml → src/main/resources/mapper/TaSchoolTermMapper.xml

@@ -1,5 +1,5 @@
 <?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.training.mapper.TaActivitySignMapper">
+<mapper namespace="com.yunzhi.training.mapper.TaSchoolTermMapper">
 
 </mapper>

src/main/resources/mapper/TaSignInMapper.xml

@@ -0,0 +1,5 @@
+<?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.training.mapper.TaSignInMapper">
+
+</mapper>

src/main/resources/mapper/TaSignPersonMapper.xml

@@ -0,0 +1,5 @@
+<?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.training.mapper.TaSignPersonMapper">
+
+</mapper>

src/main/resources/mapper/TaSignPlainMapper.xml

@@ -0,0 +1,5 @@
+<?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.training.mapper.TaSignPlainMapper">
+
+</mapper>

src/main/resources/mapper/TaStudentMapper.xml

@@ -0,0 +1,33 @@
+<?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.training.mapper.TaStudentMapper">
+
+    <select id="getPageBy" resultType="com.yunzhi.training.entity.TaStudent">
+        SELECT
+            t.*,
+            s.`name` AS term_name,
+            m.`name` AS class_name
+        FROM
+            ta_student t
+                LEFT JOIN ta_school_term s ON s.term_id = t.term_id
+                LEFT JOIN ta_school_class m ON m.class_id = t.class_id
+        WHERE
+            t.state &gt; - 1
+          <if test="termId != null and termId != ''">
+              AND t.term_id = #{termId}
+          </if>
+          <if test="classId != null and classId != ''">
+              AND t.class_id = #{classId}
+          </if>
+          <if test="name != null and name != ''">
+              AND t.`name` LIKE CONCAT( '%', #{name}, '%' )
+          </if>
+          <if test="phone != null and phone != ''">
+              AND t.phone LIKE CONCAT( '%', #{phone}, '%' )
+          </if>
+        ORDER BY
+            t.term_id ASC,
+            t.class_id ASC,
+            t.`name` ASC
+    </select>
+</mapper>