feats

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

@@ -42,14 +42,6 @@ public class JWTUtils {
         Date iat = datePair[0];
         Date exp = datePair[1];
 
-        if (null != claims.get("exp")) {
-            Integer milliSecond = (Integer) claims.get("exp");
-            int oneMinute = 1 * 60 * 1000;
-            if (milliSecond - exp.getTime() > oneMinute) {
-                exp.setTime(milliSecond);
-            }
-        }
-
         return Jwts.builder().setIssuer(claims.get("userId").toString()).setIssuedAt(iat).setExpiration(exp).addClaims(claims).signWith(SECRET_KEY).compact();
     }
 
@@ -60,6 +52,19 @@ public class JWTUtils {
     public static String refresh(String token) {
         try {
             Claims claims = parse(token);
+
+            Integer iat = (Integer) claims.get("iat");
+            if (null != iat) {
+                long currentTime = System.currentTimeMillis() / 1000;
+                int oneMinute = 60;
+                if (currentTime - iat < oneMinute) {
+                    return token;
+                }
+            }
+
+            claims.remove("iat");
+            claims.remove("exp");
+
             return encode(claims);
         } catch (Exception e) {
             log.error("解析 JWT Token 失败: {}", e.getMessage());

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

@@ -17,9 +17,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.HashMap;
 import java.util.Map;
 
-//import java.util.HashMap;
-
-
 @Api(tags = "登入/登出")
 @RestController
 public class LoginController extends BaseController {

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

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.demo.common.BaseController;
 import com.yunzhi.demo.common.ResponseBean;
 import com.yunzhi.demo.entity.TaPost;
-import com.yunzhi.demo.service.ITaPersonService;
-import com.yunzhi.demo.service.ITaPostDataService;
-import com.yunzhi.demo.service.ITaPostService;
-import com.yunzhi.demo.service.ITaReadLogService;
+import com.yunzhi.demo.service.*;
 import com.yunzhi.demo.vo.StatisPerson;
 import com.yunzhi.demo.vo.StatisPost;
 import io.swagger.annotations.Api;
@@ -31,7 +28,7 @@ public class StatisticController extends BaseController {
     ITaPostDataService iTaPostDataService;
 
     @Autowired
-    ITaPersonService iTaPersonService;
+    ITaStudentService iTaStudentService;
 
     @Autowired
     ITaReadLogService iTaReadLogService;
@@ -46,7 +43,7 @@ public class StatisticController extends BaseController {
         // 获取总科普数, 以及 浏览量
         Map<String, Object> result = iTaPostDataService.getIndexBasicData();
         // 获取总学生人员
-        int totalStudents = iTaPersonService.countStudent();
+        int totalStudents = iTaStudentService.countStudent();
         result.put("student", totalStudents);
 
         return ResponseBean.success(result);
@@ -107,7 +104,7 @@ public class StatisticController extends BaseController {
                                       @ApiParam("降序") @RequestParam(value = "desc", required = false) String desc) {
         IPage<StatisPerson> pg = new Page<>(pageNum, pageSize);
 
-        IPage<StatisPerson> personList = iTaPersonService.getStudentStatis(pg, name, schoolId, specialtyId, asc, desc);
+        IPage<StatisPerson> personList = iTaStudentService.getStudentStatis(pg, name, schoolId, specialtyId, asc, desc);
 
         return ResponseBean.success(personList);
     }

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

@@ -7,7 +7,7 @@ import com.yunzhi.demo.common.BaseController;
 import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.common.ResponseBean;
 import com.yunzhi.demo.common.StringUtils;
-import com.yunzhi.demo.entity.TaPost;
+import com.yunzhi.demo.vo.SortParams;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -74,6 +74,14 @@ public class SysBannerController extends BaseController {
     @ApiOperation(value="保存", notes = "保存", httpMethod = "POST", response = ResponseBean.class)
     public ResponseBean bannerAdd(@ApiParam("保存内容") @RequestBody SysBanner sysBanner) throws Exception{
 
+        QueryWrapper<SysBanner> queryWrapper = new QueryWrapper<SysBanner>()
+                .orderByDesc("sort_no")
+                .last("limit 1");
+
+        SysBanner max = iSysBannerService.getOne(queryWrapper);
+        int sortNo = max == null ? 0 : max.getSortNo() + 1;
+        sysBanner.setSortNo(sortNo);
+
         if (iSysBannerService.save(sysBanner)){
             return ResponseBean.success(sysBanner);
         }else {
@@ -132,4 +140,16 @@ public class SysBannerController extends BaseController {
 
         return ResponseBean.success(sysBanner);
     }
+
+
+    @RequestMapping(value="/admin/sort/banner",method= RequestMethod.PUT)
+    @ApiOperation(value="排序", notes = "排序", httpMethod = "PUT", response = ResponseBean.class)
+    public ResponseBean bannerSort(@ApiParam("排序") @RequestBody SortParams sortParams) throws Exception {
+        if (StringUtils.isEmpty(sortParams.getFrom()) || StringUtils.isEmpty(sortParams.getTo())) {
+            return ResponseBean.success("success");
+        }
+
+        iSysBannerService.reSort(sortParams);
+        return ResponseBean.success("success");
+    }
 }

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

@@ -1,28 +1,12 @@
 package com.yunzhi.demo.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.demo.common.BaseController;
-import com.yunzhi.demo.common.Constants;
-import com.yunzhi.demo.common.ResponseBean;
-import com.yunzhi.demo.common.StringUtils;
-import com.yunzhi.demo.entity.TaPersonData;
-import com.yunzhi.demo.entity.TdSchool;
-import com.yunzhi.demo.entity.TdSpecialty;
 import com.yunzhi.demo.service.*;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.yunzhi.demo.entity.TaPerson;
-
-import java.time.LocalDateTime;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * <p>
@@ -43,132 +27,4 @@ public class TaPersonController extends BaseController {
     @Autowired
     ITaPersonService iTaPersonService;
 
-    @Autowired
-    ITaPersonDataService iTaPersonDataService;
-
-    @Autowired
-    ITdSchoolService iTdSchoolService;
-
-    @Autowired
-    ITdSpecialtyService iTdSpecialtyService;
-
-    /**
-     * 分页查询列表
-     * @param pageNum
-     * @param pageSize
-     * @return
-     */
-    @RequestMapping(value="/admin/person",method= RequestMethod.GET)
-    @ApiOperation(value="查询学生列表", notes = "查询学生列表", httpMethod = "GET", response = ResponseBean.class)
-    public ResponseBean taPersonList(@ApiParam("页码") @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-									 @ApiParam("单页数据量") @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                     @ApiParam("名称") @RequestParam(value ="name", required = false) String name,
-                                     @ApiParam("学校ID") @RequestParam(value ="schoolId", required = false) String schoolId,
-                                     @ApiParam("专业ID") @RequestParam(value ="specialtyId", required = false) String specialtyId,
-                                     @ApiParam("手机") @RequestParam(value ="phone", required = false) String phone,
-                                     @ApiParam("学号") @RequestParam(value ="studentId", required = false) String studentId) throws Exception{
-
-		    IPage<TaPerson> pg = new Page<>(pageNum, pageSize);
-            IPage<TaPerson> result = iTaPersonService.getStudentInfoPagedBy(pg, name, schoolId, specialtyId, phone, studentId);
-            return ResponseBean.success(result);
-    }
-
-    /**
-     * 小程序完善信息
-     * @param taPerson 实体对象
-     * @return
-     */
-    @RequestMapping(value="/ma/person",method= RequestMethod.PUT)
-    @ApiOperation(value="小程序完善信息", notes = "更新当前人自己的信息", httpMethod = "PUT", response = TaPerson.class)
-    public ResponseBean taPersonUpdate(@ApiParam("更新内容") @RequestBody TaPerson taPerson) throws Exception{
-        TaPerson currentPerson = getCurrentPerson();
-        if (null == currentPerson || null == taPerson || !currentPerson.getPersonId().equals(taPerson.getPersonId())) {
-            throw new Exception("校验人员信息失败");
-        }
-
-        if (!StringUtils.isEmpty(taPerson.getStudentId())) {
-            TaPerson stu = iTaPersonService.getByStudentId(taPerson.getStudentId());
-            if (null != stu && stu.getPersonId().equals(taPerson.getPersonId())) {
-                throw new Exception("学号信息重复");
-            }
-        }
-
-        taPerson.setUpdateDate(LocalDateTime.now());
-
-        if (iTaPersonService.updateById(taPerson)){
-
-            taPerson = iTaPersonService.getById(taPerson.getPersonId());
-            fillInfo(taPerson);
-
-            return ResponseBean.success(taPerson);
-        }else {
-            return ResponseBean.error("修改失败, 请重试", ResponseBean.ERROR_UNAVAILABLE);
-        }
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  实体ID
-     */
-    @RequestMapping(value="/admin/person/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="学生详情", notes = "查询人员详细信息", httpMethod = "GET", response = TaPerson.class)
-    public ResponseBean taPersonGet(@ApiParam("学生ID") @PathVariable String id) throws Exception{
-        TaPerson taPerson = iTaPersonService.getById(id);
-        if (null == taPerson || Constants.STATUS_DELETED.equals(taPerson.getStatus())) {
-            throw new Exception("验证人员信息失败, 请退出重试");
-        }
-
-        fillInfo(taPerson);
-
-        return ResponseBean.success(taPerson);
-    }
-
-    /**
-     * 根据id查询对象
-     * @param id  学号
-     */
-    @RequestMapping(value="/admin/student/{id}",method= RequestMethod.GET)
-    @ApiOperation(value="学生详情", notes = "查询人员详细信息", httpMethod = "GET", response = TaPerson.class)
-    public ResponseBean studentGet(@ApiParam("学生学号") @PathVariable String id) throws Exception{
-        TaPerson taPerson = iTaPersonService.getByStudentId(id);
-        if (null == taPerson || Constants.STATUS_DELETED.equals(taPerson.getStatus())) {
-            throw new Exception("验证人员信息失败, 请退出重试");
-        }
-
-        fillInfo(taPerson);
-
-        return ResponseBean.success(taPerson);
-    }
-
-    @GetMapping("/ma/currentPerson")
-    @ApiOperation(value="小程序当前人员", notes = "获取当前人员信息", httpMethod = "GET", response = TaPerson.class)
-    public ResponseBean getCurrent() throws Exception {
-        TaPerson taPerson = getCurrentPerson();
-        if (null == taPerson) {
-            throw new Exception("验证人员信息失败, 请退出重试");
-        }
-
-        fillInfo(taPerson);
-
-        return ResponseBean.success(taPerson);
-    }
-
-    private void fillInfo(TaPerson taPerson) {
-        // 冗余学校名称, 专业名称
-        if (null != taPerson.getSchoolId()) {
-            TdSchool tdSchool = iTdSchoolService.getById(taPerson.getSchoolId());
-            if (null != tdSchool) {
-                taPerson.setSchoolName(tdSchool.getName());
-            }
-
-            TdSpecialty tdSpecialty = iTdSpecialtyService.getById(taPerson.getSpecialtyId());
-            if (null != tdSpecialty) {
-                taPerson.setSpecialtyName(tdSpecialty.getName());
-            }
-        }
-
-        // 获取统计数据
-        TaPersonData taPersonData = iTaPersonDataService.getById(taPerson.getPersonId());
-        taPerson.setPersonData(taPersonData);
-    }
 }

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

@@ -0,0 +1,194 @@
+package com.yunzhi.demo.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.demo.common.BaseController;
+import com.yunzhi.demo.common.Constants;
+import com.yunzhi.demo.common.ResponseBean;
+import com.yunzhi.demo.common.StringUtils;
+import com.yunzhi.demo.entity.*;
+import com.yunzhi.demo.service.ITaPersonDataService;
+import com.yunzhi.demo.service.ITaStudentService;
+import com.yunzhi.demo.service.ITdSchoolService;
+import com.yunzhi.demo.service.ITdSpecialtyService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@Api(tags = "学生")
+@RestController
+@RequestMapping("/")
+public class TaStudentController extends BaseController {
+
+    @Autowired
+    ITaStudentService iTaStudentService;
+
+    @Autowired
+    ITaPersonDataService iTaPersonDataService;
+
+    @Autowired
+    ITdSchoolService iTdSchoolService;
+
+    @Autowired
+    ITdSpecialtyService iTdSpecialtyService;
+
+    /**
+     * 分页查询列表
+     * @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 ="name", required = false) String name,
+                                     @ApiParam("学校ID") @RequestParam(value ="schoolId", required = false) String schoolId,
+                                     @ApiParam("专业ID") @RequestParam(value ="specialtyId", required = false) String specialtyId,
+                                     @ApiParam("手机") @RequestParam(value ="phone", required = false) String phone,
+                                     @ApiParam("学号") @RequestParam(value ="studentNo", required = false) String studentNo) throws Exception {
+
+        IPage<TaStudent> pg = new Page<>(pageNum, pageSize);
+        IPage<TaStudent> result = iTaStudentService.getStudentInfoPagedBy(pg, name, schoolId, specialtyId, phone, studentNo);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 小程序完善信息
+     * @param taStudent 实体对象
+     * @return
+     */
+    @RequestMapping(value="/ma/student",method= RequestMethod.PUT)
+    @ApiOperation(value="小程序完善信息", notes = "更新当前人自己的信息", httpMethod = "PUT", response = TaStudent.class)
+    public ResponseBean taPersonUpdate(@ApiParam("更新内容") @RequestBody TaStudent taStudent) throws Exception{
+        TaPerson currentPerson = getCurrentPerson();
+        if (null == currentPerson || null == taStudent) {
+            throw new Exception("校验人员信息失败");
+        }
+
+        // 解决人员跟学生映射问题
+        if (!StringUtils.isEmpty(taStudent.getStudentId())) {
+            TaStudent origin = iTaStudentService.getByPersonId(currentPerson.getPersonId());
+            if (null != origin) {
+                taStudent.setStudentId(origin.getStudentId());
+            } else {
+                origin = iTaStudentService.getByPhone(currentPerson.getPhone());
+                if (null != origin) {
+                    taStudent.setStudentId(origin.getStudentId());
+                }
+            }
+        }
+
+        if (!StringUtils.isEmpty(taStudent.getStudentNo())) {
+            TaStudent stu = iTaStudentService.getByStudentNo(taStudent.getStudentNo());
+            if (null != stu && !StringUtils.isEmpty(taStudent.getStudentId()) && stu.getStudentId().equals(taStudent.getStudentId())) {
+                throw new Exception("学号信息重复");
+            }
+        }
+
+        taStudent.setUpdateDate(LocalDateTime.now());
+        taStudent.setPersonId(currentPerson.getPersonId());
+
+        if (StringUtils.isEmpty(taStudent.getStudentId())) {
+            iTaStudentService.save(taStudent);
+        } else {
+            iTaStudentService.updateById(taStudent);
+        }
+
+        fillInfo(taStudent);
+        return ResponseBean.success(taStudent);
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/admin/student/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="学生详情", notes = "查询人员详细信息", httpMethod = "GET", response = TaPerson.class)
+    public ResponseBean taPersonGet(@ApiParam("学生ID") @PathVariable String id) throws Exception{
+        TaStudent taStudent = iTaStudentService.getById(id);
+        if (null == taStudent || Constants.STATUS_DELETED.equals(taStudent.getStatus())) {
+            throw new Exception("验证人员信息失败, 请退出重试");
+        }
+
+        fillInfo(taStudent);
+
+        return ResponseBean.success(taStudent);
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  学号
+     */
+    @RequestMapping(value="/admin/student-no/{id}",method= RequestMethod.GET)
+    @ApiOperation(value="学生详情", notes = "查询人员详细信息", httpMethod = "GET", response = TaPerson.class)
+    public ResponseBean studentGet(@ApiParam("学生学号") @PathVariable String id) throws Exception{
+        TaStudent taStudent = iTaStudentService.getByStudentNo(id);
+        if (null == taStudent || Constants.STATUS_DELETED.equals(taStudent.getStatus())) {
+            throw new Exception("验证人员信息失败, 请退出重试");
+        }
+
+        fillInfo(taStudent);
+
+        return ResponseBean.success(taStudent);
+    }
+
+    @GetMapping("/ma/currentPerson")
+    @ApiOperation(value="小程序当前人员", notes = "获取当前人员信息", httpMethod = "GET", response = TaPerson.class)
+    public ResponseBean getCurrent() throws Exception {
+        TaPerson taPerson = getCurrentPerson();
+        if (null == taPerson) {
+            throw new Exception("验证人员信息失败, 请退出重试");
+        }
+
+        // 先找映射ID的
+        TaStudent taStudent = iTaStudentService.getByPersonId(taPerson.getPersonId());
+        if (null == taStudent) {
+            // 如果没有再找相同手机号的
+            if (!StringUtils.isEmpty(taPerson.getPhone())) {
+                taStudent = iTaStudentService.getByPhone(taPerson.getPhone());
+                if (null != taStudent) {
+                    if (!StringUtils.isEmpty(taStudent.getPersonId())) {
+                        log.error("学生[{}]与人员[{}]映射异常", taStudent.getStudentId(), taPerson.getPersonId());
+                    } else {
+                        taStudent.setPersonId(taPerson.getPersonId());
+                        iTaStudentService.updateById(taStudent);
+                    }
+                }
+            }
+        }
+
+        if (null != taStudent) {
+            fillInfo(taStudent);
+        }
+
+        taPerson.setStudent(taStudent);
+
+        return ResponseBean.success(taPerson);
+    }
+
+    private void fillInfo(TaStudent taStudent) {
+        // 冗余学校名称, 专业名称
+        if (null != taStudent.getSchoolId()) {
+            TdSchool tdSchool = iTdSchoolService.getById(taStudent.getSchoolId());
+            if (null != tdSchool) {
+                taStudent.setSchoolName(tdSchool.getName());
+            }
+
+            TdSpecialty tdSpecialty = iTdSpecialtyService.getById(taStudent.getSpecialtyId());
+            if (null != tdSpecialty) {
+                taStudent.setSpecialtyName(tdSpecialty.getName());
+            }
+        }
+
+        // 获取统计数据
+        TaPersonData taPersonData = iTaPersonDataService.getById(taStudent.getPersonId());
+        taStudent.setPersonData(taPersonData);
+    }
+}

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

@@ -31,8 +31,8 @@ public class TaMedicalLog implements Serializable {
     @TableId(value = "serial_no", type = IdType.AUTO)
     private Integer serialNo;
 
-    @ApiModelProperty(value = "人员ID")
-    private String personId;
+    @ApiModelProperty(value = "学生ID")
+    private String studentId;
 
     @ApiModelProperty(value = "就诊时间 YYYY-MM-DD格式")
     private String recordDate;
@@ -82,7 +82,6 @@ public class TaMedicalLog implements Serializable {
 
     @ApiModelProperty(value = "学号")
     @TableField(exist = false)
-    private String studentId;
-
+    private String studentNo;
 
 }

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

@@ -35,9 +35,6 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "openid")
     private String openid;
 
-    @ApiModelProperty(value = "姓名")
-    private String name;
-
     @ApiModelProperty(value = "性别")
     private Integer sex;
 
@@ -50,29 +47,6 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "手机")
     private String phone;
 
-    @ApiModelProperty(value = "邮箱")
-    private String eMail;
-
-    @ApiModelProperty(value = "学校ID")
-    private String schoolId;
-
-    @ApiModelProperty(value = "学校名称")
-    @TableField(exist = false)
-    private String schoolName;
-
-    @ApiModelProperty(value = "学界")
-    private String schoolBatch;
-
-    @ApiModelProperty(value = "专业ID")
-    private String specialtyId;
-
-    @ApiModelProperty(value = "专业名称")
-    @TableField(exist = false)
-    private String specialtyName;
-
-    @ApiModelProperty(value = "学号")
-    private String studentId;
-
     @ApiModelProperty(value = "状态")
     private Integer status;
 
@@ -82,6 +56,10 @@ public class TaPerson implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime updateDate;
 
+    @ApiModelProperty(value = "学生信息")
+    @TableField(exist = false)
+    private TaStudent student;
+
     @ApiModelProperty(value = "统计数据")
     @TableField(exist = false)
     private TaPersonData personData;

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

@@ -0,0 +1,82 @@
+package com.yunzhi.demo.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 人员
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+@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 = "映射人员ID")
+    private String personId;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "性别")
+    private Integer sex;
+
+    @ApiModelProperty(value = "手机")
+    private String phone;
+
+    @ApiModelProperty(value = "邮箱")
+    private String eMail;
+
+    @ApiModelProperty(value = "学校ID")
+    private String schoolId;
+
+    @ApiModelProperty(value = "学校名称")
+    @TableField(exist = false)
+    private String schoolName;
+
+    @ApiModelProperty(value = "学界")
+    private String schoolBatch;
+
+    @ApiModelProperty(value = "专业ID")
+    private String specialtyId;
+
+    @ApiModelProperty(value = "专业名称")
+    @TableField(exist = false)
+    private String specialtyName;
+
+    @ApiModelProperty(value = "学号")
+    private String studentNo;
+
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    @ApiModelProperty(value = "创建时间")
+    private LocalDateTime createDate;
+
+    @ApiModelProperty(value = "更新时间")
+    private LocalDateTime updateDate;
+
+    @ApiModelProperty(value = "统计信息")
+    @TableField(exist = false)
+    private TaPersonData personData;
+}

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

@@ -30,8 +30,8 @@ public class TaTestLog implements Serializable {
     @TableId(value = "serial_no", type = IdType.AUTO)
     private Integer serialNo;
 
-    @ApiModelProperty(value = "人员ID")
-    private String personId;
+    @ApiModelProperty(value = "学生ID")
+    private String studentId;
 
     @ApiModelProperty(value = "报告名称")
     private String name;

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

@@ -15,4 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysBannerMapper extends BaseMapper<SysBanner> {
 
+    int bannerSortAdd(Integer max, Integer min);
+
+    int bannerSortSub(Integer max, Integer min);
 }

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

@@ -0,0 +1,34 @@
+package com.yunzhi.demo.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yunzhi.demo.entity.TaStudent;
+import com.yunzhi.demo.vo.StatisPerson;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 人员 Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+@Mapper
+public interface TaStudentMapper extends BaseMapper<TaStudent> {
+
+    IPage<StatisPerson> getStudentStatis(IPage<StatisPerson> pg,
+                                        @Param("name") String name,
+                                        @Param("schoolId") String schoolId,
+                                        @Param("specialtyId") String specialtyId,
+                                        @Param("asc") String asc,
+                                        @Param("desc") String desc);
+
+    IPage<TaStudent> getStudentInfoPagedBy(IPage<TaStudent> pg,
+                                          @Param("name") String name,
+                                          @Param("schoolId") String schoolId,
+                                          @Param("specialtyId") String specialtyId,
+                                          @Param("phone") String phone,
+                                          @Param("studentNo") String studentNo);
+}

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

@@ -2,6 +2,7 @@ package com.yunzhi.demo.service;
 
 import com.yunzhi.demo.entity.SysBanner;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.demo.vo.SortParams;
 
 import java.util.List;
 
@@ -16,4 +17,6 @@ import java.util.List;
 public interface ISysBannerService extends IService<SysBanner> {
 
     List<SysBanner> getIndexList();
+
+    void reSort(SortParams sortParams);
 }

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

@@ -0,0 +1,28 @@
+package com.yunzhi.demo.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.demo.entity.TaStudent;
+import com.yunzhi.demo.vo.StatisPerson;
+
+/**
+ * <p>
+ * 人员 服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+public interface ITaStudentService extends IService<TaStudent> {
+    int countStudent();
+
+    IPage<StatisPerson> getStudentStatis(IPage<StatisPerson> pg, String name, String schoolId, String specialtyId, String asc, String desc);
+
+    IPage<TaStudent> getStudentInfoPagedBy(IPage<TaStudent> pg, String name, String schoolId, String specialtyId, String phone, String studentNo);
+
+    TaStudent getByStudentNo(String studentNo);
+
+    TaStudent getByPersonId(String personId);
+
+    TaStudent getByPhone(String phone);
+}

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

@@ -1,11 +1,15 @@
 package com.yunzhi.demo.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.yunzhi.demo.common.Constants;
 import com.yunzhi.demo.entity.SysBanner;
+import com.yunzhi.demo.entity.TaTopic;
 import com.yunzhi.demo.mapper.SysBannerMapper;
 import com.yunzhi.demo.service.ISysBannerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.demo.vo.SortParams;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -21,6 +25,9 @@ import java.util.List;
 @Service
 public class SysBannerServiceImpl extends ServiceImpl<SysBannerMapper, SysBanner> implements ISysBannerService {
 
+    @Autowired
+    SysBannerMapper sysBannerMapper;
+
     @Override
     public List<SysBanner> getIndexList() {
         QueryWrapper<SysBanner> queryWrapper = new QueryWrapper<SysBanner>()
@@ -28,4 +35,28 @@ public class SysBannerServiceImpl extends ServiceImpl<SysBannerMapper, SysBanner
                 .orderByAsc("sort_no");
         return list(queryWrapper);
     }
+
+    @Override
+    public void reSort(SortParams sortParams) {
+        if (sortParams.getFrom().equals(sortParams.getTo())) {
+            return;
+        }
+
+        SysBanner from = getById(sortParams.getFrom());
+        SysBanner to = getById(sortParams.getTo());
+
+        Integer source = from.getSortNo();
+        Integer target = to.getSortNo();
+
+        if (source > target) {
+            sysBannerMapper.bannerSortAdd(source, target);
+        } else {
+            sysBannerMapper.bannerSortSub(source, target);
+        }
+
+        UpdateWrapper<SysBanner> updateWrapper = new UpdateWrapper<SysBanner>()
+                .set("sort_no", target)
+                .eq("serial_no", sortParams.getFrom());
+        update(updateWrapper);
+    }
 }

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

@@ -75,7 +75,7 @@ public class TaPointsLogServiceImpl extends ServiceImpl<TaPointsLogMapper, TaPoi
             e.printStackTrace();
 
             log.error(String.format("奖励[%s-%s] 阅读[%s-%s] 积分 %d 失败: %s",
-                    StringUtils.ifNull(taPerson.getName(), taPerson.getNickName()),
+                    taPerson.getNickName(),
                     taPerson.getPersonId(),
                     taPost.getName(),
                     taPost.getPostId(),

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

@@ -0,0 +1,89 @@
+package com.yunzhi.demo.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.demo.common.Constants;
+import com.yunzhi.demo.common.StringUtils;
+import com.yunzhi.demo.entity.TaStudent;
+import com.yunzhi.demo.mapper.TaStudentMapper;
+import com.yunzhi.demo.service.ITaStudentService;
+import com.yunzhi.demo.vo.StatisPerson;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 人员 服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2021-04-15
+ */
+@Service
+public class TaStudentServiceImpl extends ServiceImpl<TaStudentMapper, TaStudent> implements ITaStudentService {
+
+    @Autowired
+    TaStudentMapper taStudentMapper;
+
+    @Override
+    public int countStudent() {
+        QueryWrapper<TaStudent> queryWrapper = new QueryWrapper<TaStudent>()
+                .gt("status", Constants.STATUS_DELETED);
+        return count(queryWrapper);
+    }
+
+    @Override
+    public IPage<StatisPerson> getStudentStatis(IPage<StatisPerson> pg, String name, String schoolId, String specialtyId, String asc, String desc) {
+        if (StringUtils.isEmpty(asc) && StringUtils.isEmpty(desc)) {
+            desc = "readedNum";
+        }
+        return taStudentMapper.getStudentStatis(pg, name, schoolId, specialtyId, getDBFieldBy(asc), getDBFieldBy(desc));
+    }
+
+    @Override
+    public IPage<TaStudent> getStudentInfoPagedBy(IPage<TaStudent> pg, String name, String schoolId, String specialtyId, String phone, String studentNo) {
+        return taStudentMapper.getStudentInfoPagedBy(pg, name, schoolId, specialtyId, phone, studentNo);
+    }
+
+    @Override
+    public TaStudent getByStudentNo(String studentNo) {
+        QueryWrapper<TaStudent> queryWrapper = new QueryWrapper<TaStudent>()
+                .eq("student_no", studentNo)
+                .gt("status", Constants.STATUS_DELETED);
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public TaStudent getByPersonId(String personId) {
+        QueryWrapper<TaStudent> queryWrapper = new QueryWrapper<TaStudent>()
+                .eq("person_id", personId)
+                .gt("status", Constants.STATUS_DELETED);
+        return getOne(queryWrapper);
+    }
+
+    @Override
+    public TaStudent getByPhone(String phone) {
+        QueryWrapper<TaStudent> queryWrapper = new QueryWrapper<TaStudent>()
+                .eq("phone", phone)
+                .gt("status", Constants.STATUS_DELETED);
+        return getOne(queryWrapper);
+    }
+
+    private String getDBFieldBy(String name) {
+        if (StringUtils.isEmpty(name)) {
+            return null;
+        }
+
+        switch (name.toLowerCase()) {
+            case "readedNum":
+                return "readed_num";
+            case "creditNum":
+                return "credit_num";
+            case "pointNum":
+                return "point_num";
+            default:
+                return "saved_num";
+        }
+    }
+}

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

@@ -1,13 +1,13 @@
 package com.yunzhi.demo.vo;
 
-import com.yunzhi.demo.entity.TaPerson;
+import com.yunzhi.demo.entity.TaStudent;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @ApiModel(description = "学生统计")
 @Data
-public class StatisPerson extends TaPerson {
+public class StatisPerson extends TaStudent {
 
     @ApiModelProperty(value = "积分")
     private Integer pointNum;

src/main/resources/mapper/SysBannerMapper.xml

@@ -2,4 +2,20 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.demo.mapper.SysBannerMapper">
 
+    <update id="bannerSortAdd">
+        UPDATE sys_banner
+        SET sort_no = sort_no + 1
+        WHERE
+            `status` > - 1
+          AND sort_no &gt;= #{min}
+          AND sort_no &lt; #{max}
+    </update>
+    <update id="bannerSortSub">
+        UPDATE sys_banner
+        SET sort_no = sort_no - 1
+        WHERE
+            `status` > - 1
+          AND sort_no &gt; #{min}
+          AND sort_no &lt;= #{max}
+    </update>
 </mapper>

src/main/resources/mapper/TaStudentMapper.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.demo.mapper.TaStudentMapper">
+
+    <select id="getStudentStatis" resultType="com.yunzhi.demo.vo.StatisPerson">
+        SELECT
+            t.*,
+            s.credit_num,
+            s.point_num,
+            s.readed_num,
+            s.saved_num
+        FROM
+            ta_student t
+                INNER JOIN ta_person_data s ON t.person_id = s.person_id
+        WHERE t.`status` > - 1
+        <if test="name != null and name != ''">
+            AND t.`name` LIKE CONCAT('%', #{name}, '%')
+        </if>
+        <if test="schoolId != null and schoolId != ''">
+            AND t.school_id = #{schoolId}
+        </if>
+        <if test="specialtyId != null and specialtyId != ''">
+          AND t.specialty_id = #{specialtyId}
+        </if>
+        ORDER BY
+        <if test="asc != null and asc != ''">
+            ${asc} ASC
+        </if>
+        <if test="desc != null and desc != ''">
+            ${desc} DESC
+        </if>
+    </select>
+
+    <select id="getStudentInfoPagedBy" resultType="com.yunzhi.demo.entity.TaStudent">
+        SELECT
+            t.*,
+            s.`name` AS school_name,
+            m.`name` AS specialty_name
+        FROM
+            ta_student t
+                INNER JOIN td_school s ON t.school_id = s.school_id
+                INNER JOIN td_specialty m ON t.specialty_id = m.specialty_id
+        WHERE
+            t.`status` > - 1
+        <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>
+        <if test="studentNo != null and studentNo != ''">
+          AND t.student_no = LIKE CONCAT( '%', #{studentNo}, '%' )
+        </if>
+        <if test="schoolId != null and schoolId != ''">
+          AND t.school_id = #{schoolId}
+        </if>
+        <if test="specialtyId != null and specialtyId != ''">
+          AND t.specialty_id = #{specialtyId}
+        </if>
+        ORDER BY
+            t.create_date DESC
+    </select>
+</mapper>