Merge remote-tracking branch 'cloud-schoolapi/ywx'

slive/src/main/java/com/xhkjedu/slive/controller/liveplay/CourseSectionController.java

@@ -260,14 +260,15 @@ public class CourseSectionController {
         N_Utils.validation(new Object[]{classid, "班级id", 1});
         Integer page = student.getPage();
         String studentname = student.getStudentname();
+        Integer year = courseSectionService.getYearByClassId(classid);
         if (N_Utils.isEmptyInteger(page)) {
-            List<Map> list = courseSectionService.listStudent(classid, studentname);
+            List<Map> list = courseSectionService.listStudent(classid, studentname, year);
             return new ResultVo(0,"获取课程学生列表成功",list);
         } else {
             Integer pageSize = student.getPageSize();
             N_Utils.validation(new Object[]{pageSize, "显示条数", 1});
             PageHelper.startPage(page, pageSize);
-            List<Map> list = courseSectionService.listStudent(classid, studentname);
+            List<Map> list = courseSectionService.listStudent(classid, studentname, year);
             PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
             return new ResultVo(0, "获取课程学生列表成功", pageResult);
         }

slive/src/main/java/com/xhkjedu/slive/service/liveplay/CourseSectionService.java

@@ -27,12 +27,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
 /**
@@ -357,8 +352,7 @@ public class CourseSectionService {
     }
 
     //获取课程学生列表
-    public List<Map> listStudent(Integer classid, String studentname) {
-        Integer year = classMapper.getYearById(classid);
+    public List<Map> listStudent(Integer classid, String studentname, Integer year) {
         List<Map> list = courseSectionMapper.listStudent(classid, studentname, year);
         for (Map map : list) {
             String classname = (String) map.get("classname");
@@ -371,6 +365,18 @@ public class CourseSectionService {
         return list;
     }
 
+    /**
+     * 获取当前班级年份
+     *
+     * @param [classid]
+     * @return java.lang.Integer
+     * @author ywx
+     * @date 2022/4/8 21:02
+     */
+    public Integer getYearByClassId(Integer classid) {
+        return classMapper.getYearById(classid);
+    }
+
     //学生课节日历
     public List<Map> listStuSectionDate(CourseParams params) {
         return courseSectionMapper.listStuSectionDate(params);

suser/src/main/java/com/xhkjedu/suser/controller/system/UserController.java

@@ -515,4 +515,20 @@ public class UserController {
         N_Utils.validation(new Object[]{userid, "用户id", 1, usid, "密保id", 1, usanswer, "密保答案", 2});
         return userService.checkUsecret(userid, usid, usanswer);
     }
+
+    /**
+     * 校验用户密码
+     *
+     * @param [user]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/4/8 15:05
+     */
+    @PostMapping("/check_pwd")
+    public ResultVo checkPwd(@RequestBody TUser user) {
+        Integer userid = user.getUserid();
+        String loginpwd = user.getLoginpwd();
+        N_Utils.validation(new Object[]{userid, "用户id", 1, loginpwd, "密码", 2});
+        return userService.checkPwd(user);
+    }
 }

suser/src/main/java/com/xhkjedu/suser/mapper/system/UserMapper.java

@@ -207,4 +207,7 @@ public interface UserMapper extends TkMapper<TUser> {
 
     //获取手机号绑定的其他用户数量
     Integer getNumByUserPhone(Integer userid, String userphone);
+
+    //根据用户id获取密码
+    String getPwdByUserId(Integer userid);
 }

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -944,4 +944,20 @@ public class UserService extends JedisUtil {
         if (!usanswer.equals(answer)) return new ResultVo(1, "输入答案有误");
         return new ResultVo(0, "校验密保答案成功");
     }
+
+    /**
+     * 校验用户密码
+     *
+     * @param [user]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/4/8 15:05
+     */
+    public ResultVo checkPwd(TUser user) {
+        String pwd = userMapper.getPwdByUserId(user.getUserid());
+        setLoginPwd(user);
+        String loginpwd = user.getLoginpwd();
+        if (!loginpwd.equals(pwd)) return new ResultVo(1, "密码不正确");
+        return new ResultVo(0, "密码正确");
+    }
 }

suser/src/main/resources/mapper/system/UserMapper.xml

@@ -199,6 +199,10 @@
     <select id="getNumByUserPhone" resultType="java.lang.Integer">
         select count(*) from t_user where userid!=#{userid} and userphone=#{userphone}
     </select>
+    <!--根据用户id获取密码-->
+    <select id="getPwdByUserId" resultType="java.lang.String">
+        select loginpwd from t_user where userid=#{userid}
+    </select>
 
 
 </mapper>