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

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

@@ -0,0 +1,96 @@
+package com.xhkjedu.suser.controller.system;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.suser.model.system.TUsecret;
+import com.xhkjedu.suser.service.system.UsecretService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("usecret")
+public class UsecretController {
+    @Resource
+    private UsecretService usecretService;
+
+    /**
+      * 添加
+      * @param [usecret]
+      * @author ywx
+      * @date 2022/3/30 11:33
+      * @return com.xhkjedu.vo.ResultVo
+      */
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TUsecret usecret) {
+        usecretService.save(usecret);
+        return new ResultVo(0,"保存成功");
+    }
+
+    /**
+      * 修改
+      * @param [usecret]
+      * @author ywx
+      * @date 2022/3/30 11:33
+      * @return com.xhkjedu.vo.ResultVo
+      */
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TUsecret usecret) {
+        N_Utils.validation(new Object[]{usecret.getUsid(), "密保问题id", 1});
+        return usecretService.update(usecret);
+    }
+
+    /**
+      * 删除
+      * @param [usecret]
+      * @author ywx
+      * @date 2022/3/30 11:33
+      * @return com.xhkjedu.vo.ResultVo
+      */
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TUsecret usecret) {
+        Integer usid = usecret.getUsid();
+        N_Utils.validation(new Object[]{usid, "密保问题id"});
+        return usecretService.deleteById(usid);
+    }
+
+    /**
+      * 列表
+      * @param [usecret]
+      * @author ywx
+      * @date 2022/3/30 11:34
+      * @return com.xhkjedu.vo.ResultVo
+      */
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TUsecret usecret) {
+        N_Utils.validation(new Object[]{usecret.getPage(), "显示页码", 1, usecret.getPageSize(), "显示条数", 1, usecret.getSchoolid(), "学校id", 1});
+        PageHelper.startPage(usecret.getPage(),usecret.getPageSize());
+        List<Map> list = usecretService.findAll(usecret);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0,"获取列表成功",pageResult);
+    }
+
+    /**
+     * 选择表
+     * @param [usecret]
+     * @author ywx
+     * @date 2022/3/30 13:17
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/list_sel")
+    public ResultVo listForSel(@RequestBody TUsecret usecret) {
+        Integer schoolid = usecret.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1});
+        List<Map> list = usecretService.listForSel(schoolid);
+        return new ResultVo(0,"获取列表成功",list);
+    }
+}

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

@@ -2,6 +2,7 @@ package com.xhkjedu.suser.controller.system;
 
 import com.alibaba.fastjson.JSON;
 import com.xhkjedu.suser.model.system.TUser;
+import com.xhkjedu.suser.model.system.TUserUsecret;
 import com.xhkjedu.suser.service.system.UserService;
 import com.xhkjedu.suser.utils.UserUtil;
 import com.xhkjedu.suser.vo.assess.AssessParams;
@@ -404,4 +405,99 @@ public class UserController {
         Integer headtime = userService.getHeadTime(userid);
         return new ResultVo(0, "获取头像是否可以修改成功", headtime);
     }
+
+    /**
+     * 绑定密保
+     *
+     * @param [usecrets]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/3/30 12:47
+     */
+    @PostMapping("/bind_usecert")
+    public ResultVo bindUseCert(@RequestBody List<TUserUsecret> usecrets) {
+        if (N_Utils.isListEmpty(usecrets)) {
+            return new ResultVo(1, "密保问题不能为空");
+        }
+        userService.bindUseCert(usecrets);
+        return new ResultVo(0, "绑定密保成功");
+    }
+
+    /**
+     * 绑定手机
+     *
+     * @param [user]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/3/30 13:05
+     */
+    @PostMapping("/bind_userphone")
+    public ResultVo bindUserPhone(@RequestBody TUser user) {
+        Integer userid = user.getUserid();
+        String userphone = user.getUserphone();
+        Integer msgcode = user.getMsgcode();
+        N_Utils.validation(new Object[]{userid, "用户id", 1, userphone, "手机号", 2, msgcode, "短信验证码", 2});
+        return userService.bindUserPhone(userid, userphone, msgcode);
+    }
+
+    /**
+      * 验证身份
+      * @param [user]
+      * @author ywx
+      * @date 2022/3/30 14:00
+      * @return com.xhkjedu.vo.ResultVo
+      */
+    @PostMapping("/check_user")
+    public ResultVo checkUser(@RequestBody TUser user) {
+        String loginname = user.getLoginname();
+        String username = user.getUsername();
+        N_Utils.validation(new Object[]{loginname, "账号", 2, username, "姓名", 2});
+        return userService.checkUser(loginname, username);
+    }
+
+    /**
+      * 根据用户id获取关联密保
+      * @param [user]
+      * @author ywx
+      * @date 2022/3/30 14:24
+      * @return com.xhkjedu.vo.ResultVo
+      */
+    @PostMapping("/list_usecret")
+    public ResultVo listUsecret(@RequestBody TUser user) {
+        Integer userid = user.getUserid();
+        N_Utils.validation(new Object[]{userid, "用户id", 1});
+        List<Map> list = userService.listUsecret(userid);
+        return new ResultVo(0, "获取关联密保列表成功", list);
+    }
+
+    /**
+     * 根据用户id获取绑定方式
+     *
+     * @param [user]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/3/30 14:58
+     */
+    @PostMapping("/get_bind")
+    public ResultVo getBind(@RequestBody TUser user) {
+        Integer userid = user.getUserid();
+        N_Utils.validation(new Object[]{userid, "用户id", 1});
+        Map map = userService.getBind(userid);
+        return new ResultVo(0, "根据用户id获取绑定方式成功", map);
+    }
+
+    /**
+     * 生成绑定手机码
+     *
+     * @param [user]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/3/30 16:34
+     */
+    @PostMapping("/bind_code")
+    public ResultVo bindCode(@RequestBody TUser user) {
+        String userphone = user.getUserphone();
+        N_Utils.validation(new Object[]{userphone, "手机号", 2});
+        return userService.bindCode(userphone);
+    }
 }

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

@@ -0,0 +1,18 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.system.TUsecret;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface UsecretMapper extends TkMapper<TUsecret> {
+    //获取密保问题列表
+    List<Map> findAll(@Param("usecret") TUsecret usecret);
+
+    //获取密保问题选择列表
+    List<Map> listForSel(Integer schoolid);
+}

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

@@ -193,4 +193,16 @@ public interface UserMapper extends TkMapper<TUser> {
 
     //获取修改头像时间
     Integer getHeadTime(Integer userid);
+
+    //绑定密保
+    void bindUseCert(Integer userid);
+
+    //绑定手机
+    void bindUserPhone(Integer userid, String userphone);
+
+    //根据账号获取绑定方式
+    Map getBindByName(String loginname);
+
+    //根据用户id获取绑定方式
+    Map getBindById(Integer userid);
 }

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

@@ -0,0 +1,20 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.system.TUserUsecret;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface UserUsecretMapper extends TkMapper<TUserUsecret> {
+    //获取密保问题使用频次
+    Integer getUseNumByUsId(Integer usid);
+
+    //根据用户id删除关联密保
+    void deleteByUserId(Integer userid);
+
+    //根据用户id获取关联密保
+    List<Map> listUsecret(Integer userid);
+}

suser/src/main/java/com/xhkjedu/suser/model/system/TUsecret.java

@@ -0,0 +1,30 @@
+package com.xhkjedu.suser.model.system;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_usecret")
+@Data
+public class TUsecret extends BaseBean {
+    //登录帐号密保问题
+    @Id
+    private Integer usid;
+
+    //密保名称
+    private String sname;
+
+    //密保问题排序
+    private Integer sorder;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+}

suser/src/main/java/com/xhkjedu/suser/model/system/TUser.java

@@ -67,6 +67,12 @@ public class TUser extends BaseBean {
     //有效期
     private String usertime;
 
+    //是否绑定手机号0未绑定1已绑定
+    private Integer bindphoned;
+
+    //是否绑定密保0未绑定1已绑定
+    private Integer bindsecret;
+
     //创建人id
     private Integer createid;
 

suser/src/main/java/com/xhkjedu/suser/model/system/TUserUsecret.java

@@ -0,0 +1,27 @@
+package com.xhkjedu.suser.model.system;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_user_usecret")
+@Data
+public class TUserUsecret extends BaseBean {
+    //用户密保关联关系表
+    @Id
+    private Integer uusid;
+
+    //用户id
+    private Integer userid;
+
+    //密保id
+    private Integer usid;
+
+    //密保答案
+    private String usanswer;
+
+    //创建时间
+    private Integer createtime;
+}

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

@@ -0,0 +1,84 @@
+package com.xhkjedu.suser.service.system;
+
+import com.xhkjedu.suser.mapper.system.UsecretMapper;
+import com.xhkjedu.suser.mapper.system.UserUsecretMapper;
+import com.xhkjedu.suser.model.system.TUsecret;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class UsecretService {
+    @Resource
+    private UsecretMapper usecretMapper;
+    @Resource
+    private UserUsecretMapper userUsecretMapper;
+
+    /**
+      * 添加
+      * @param [usecret]
+      * @author ywx
+      * @date 2022/3/30 11:41
+      * @return void
+      */
+    public void save(TUsecret usecret) {
+        usecret.setCreatetime(N_Utils.getSecondTimestamp());
+        usecretMapper.insertSelective(usecret);
+    }
+
+    /**
+      * 修改
+      * @param [usecret]
+      * @author ywx
+      * @date 2022/3/30 11:41
+      * @return com.xhkjedu.vo.ResultVo
+      */
+    public ResultVo update(TUsecret usecret) {
+        Integer usid = usecret.getUsid();
+        Integer usenum = userUsecretMapper.getUseNumByUsId(usid);//获取密保问题使用频次
+        if (usenum != 0) return new ResultVo(1,"该密保问题被使用禁止修改");
+        usecret.setCreatetime(N_Utils.getSecondTimestamp());
+        usecretMapper.updateByPrimaryKeySelective(usecret);
+        return new ResultVo(0,"修改成功");
+    }
+
+    /**
+      * 删除
+      * @param [usid]
+      * @author ywx
+      * @date 2022/3/30 11:41
+      * @return com.xhkjedu.vo.ResultVo
+      */
+    public ResultVo deleteById(Integer usid) {
+        Integer usenum = userUsecretMapper.getUseNumByUsId(usid);//获取密保问题使用频次
+        if (usenum != 0) return new ResultVo(1,"该密保问题被使用禁止删除");
+        usecretMapper.deleteByPrimaryKey(usid);
+        return new ResultVo(0,"删除成功");
+    }
+
+    /**
+      * 列表
+      * @param [usecret]
+      * @author ywx
+      * @date 2022/3/30 11:41
+      * @return java.util.List<java.util.Map>
+      */
+    public List<Map> findAll(TUsecret usecret) {
+        return usecretMapper.findAll(usecret);
+    }
+
+    /**
+      * 选择列表
+      * @param [schoolid]
+      * @author ywx
+      * @date 2022/3/30 13:17
+      * @return java.util.List<java.util.Map>
+      */
+    public List<Map> listForSel(Integer schoolid) {
+        return usecretMapper.listForSel(schoolid);
+    }
+}

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

@@ -9,10 +9,12 @@ import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
 import com.xhkjedu.suser.mapper.system.MsgMapper;
 import com.xhkjedu.suser.mapper.system.UserLogMapper;
 import com.xhkjedu.suser.mapper.system.UserMapper;
+import com.xhkjedu.suser.mapper.system.UserUsecretMapper;
 import com.xhkjedu.suser.model.gradeclass.TClassTeacher;
 import com.xhkjedu.suser.model.system.TMsg;
 import com.xhkjedu.suser.model.system.TUser;
 import com.xhkjedu.suser.model.system.TUserLog;
+import com.xhkjedu.suser.model.system.TUserUsecret;
 import com.xhkjedu.suser.utils.JedisUtil;
 import com.xhkjedu.suser.utils.PoiUtils;
 import com.xhkjedu.suser.utils.SMSSender;
@@ -57,6 +59,8 @@ public class UserService extends JedisUtil {
     private ClassMapper classMapper;
     @Autowired
     private ClassTeacherMapper classTeacherMapper;
+    @Resource
+    private UserUsecretMapper userUsecretMapper;
 
     /**
      * 功能描述  根据登录名和密码获取用户信息
@@ -649,6 +653,8 @@ public class UserService extends JedisUtil {
             msgtxt += "验证码" + messageCode + "，您正在尝试修改登录密码，请妥善保管账户信息。";
         } else if ("dlqr".equals(templateCode)) {//登录确认验证码
             msgtxt += "验证码" + messageCode + "，您正在登录，若非本人操作，请勿泄露。";
+        } else if ("bdsj".equals(templateCode)) {//绑定手机验证码
+            msgtxt += "验证码" + messageCode + "，您正在绑定手机号，若非本人操作，请勿泄露。";
         }
         ZtMsgVo m = new ZtMsgVo();
         m.setMobile(userphone);
@@ -832,4 +838,93 @@ public class UserService extends JedisUtil {
     public Integer getHeadTime(Integer userid) {
         return userMapper.getHeadTime(userid);
     }
+
+    /**
+     * 绑定密保
+     *
+     * @param [usecrets]
+     * @return void
+     * @author ywx
+     * @date 2022/3/30 12:47
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void bindUseCert(List<TUserUsecret> usecrets) {
+        Integer userid = usecrets.get(0).getUserid();
+        //先删除原来的密保问题
+        userUsecretMapper.deleteByUserId(userid);
+        usecrets.forEach(uu -> uu.setCreatetime(N_Utils.getSecondTimestamp()));
+        userUsecretMapper.insertList(usecrets);
+        userMapper.bindUseCert(userid);
+    }
+
+    /**
+     * 绑定手机
+     *
+     * @param [userid, userphone, msgcode]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/3/30 13:05
+     */
+    public ResultVo bindUserPhone(Integer userid, String userphone, Integer msgcode) {
+        ResultVo resultVo = getCodeResultVo(userphone, msgcode);
+        if (resultVo != null) return resultVo;
+        userMapper.bindUserPhone(userid, userphone);
+        return new ResultVo(0, "绑定手机成功");
+    }
+
+    /**
+      * 验证身份
+      * @param [loginname, username]
+      * @author ywx
+      * @date 2022/3/30 13:59
+      * @return com.xhkjedu.vo.ResultVo
+      */
+    public ResultVo checkUser(String loginname, String username) {
+        Map map = userMapper.getBindByName(loginname);
+        if (N_Utils.isEmpty(map)) {
+            return new ResultVo(1, "该账号不存在");
+        }
+        String username1 = map.get("username").toString();
+        if (!username.equals(username1)) {
+            return new ResultVo(1, "该账号和姓名不匹配");
+        }
+        return new ResultVo(0, "验证身份成功",map);
+    }
+
+    /**
+      * 根据用户id获取关联密保
+      * @param [userid]
+      * @author ywx
+      * @date 2022/3/30 14:24
+      * @return java.util.List<java.util.Map>
+      */
+    public List<Map> listUsecret(Integer userid) {
+        return userUsecretMapper.listUsecret(userid);
+    }
+
+    /**
+     * 根据用户id获取绑定方式
+     *
+     * @param [userid]
+     * @return java.util.Map
+     * @author ywx
+     * @date 2022/3/30 14:57
+     */
+    public Map getBind(Integer userid) {
+        return userMapper.getBindById(userid);
+    }
+
+    /**
+     * 生成绑定手机码
+     *
+     * @param [userphone]
+     * @return com.xhkjedu.vo.ResultVo
+     * @author ywx
+     * @date 2022/3/30 16:34
+     */
+    public ResultVo bindCode(String userphone) {
+        String templateCode = "bdsj";
+        if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在5分钟之后重新点击");
+        return new ResultVo(0, "生成绑定手机码成功");
+    }
 }

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.suser.mapper.system.UsecretMapper">
+    <!--获取密保问题列表-->
+    <select id="findAll" resultType="java.util.Map">
+        select u.usid,u.sname,u.sorder,u.createtime,u2.username createname
+        ,(select count(uu.uusid) from t_user_usecret uu where uu.usid=u.usid)usenum
+        from t_usecret u left join t_user u2 on u2.userid=u.createid
+        where u.schoolid=#{usecret.schoolid}
+        order by u.createtime desc
+    </select>
+    <!--获取密保问题选择列表-->
+    <select id="listForSel" resultType="java.util.Map">
+        select u.usid,u.sname from t_usecret u where u.schoolid=#{schoolid} order by u.sorder
+    </select>
+</mapper>

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

@@ -167,6 +167,24 @@
         select (case when headtime is null then 1 when headtime+6*30*24*60*60 < unix_timestamp() then 1 else 0 end)
         from t_user where userid=#{userid}
     </select>
+    <!--绑定密保-->
+    <update id="bindUseCert">
+        update t_user set bindsecret=1 where userid=#{userid}
+    </update>
+    <!--绑定手机-->
+    <update id="bindUserPhone">
+        update t_user set bindphoned=1,userphone=#{userphone} where userid=#{userid}
+    </update>
+    <!--根据账号获取绑定方式-->
+    <select id="getBindByName" resultType="java.util.Map">
+        select userid,username,userphone,bindphoned,bindsecret
+        from t_user where loginname=#{loginname} limit 1
+    </select>
+    <!--根据用户id获取绑定方式-->
+    <select id="getBindById" resultType="java.util.Map">
+        select userphone,bindphoned,bindsecret
+        from t_user where userid=#{userid} limit 1
+    </select>
 
 
 </mapper>

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

@@ -0,0 +1,18 @@
+<?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.xhkjedu.suser.mapper.system.UserUsecretMapper">
+    <!--获取密保问题使用频次-->
+    <select id="getUseNumByUsId" resultType="java.lang.Integer">
+        select count(uu.uusid) from t_user_usecret uu where uu.usid=#{usid}
+    </select>
+    <!--根据用户id删除关联密保-->
+    <delete id="deleteByUserId">
+        delete from t_user_usecret where userid=#{userid}
+    </delete>
+    <!--根据用户id获取关联密保-->
+    <select id="listUsecret" resultType="java.util.Map">
+        select uu.usid,uu.usanswer
+        ,(select u.sname from t_usecret u where u.usid=uu.usid)sname
+        from t_user_usecret uu where uu.userid=#{userid}
+    </select>
+</mapper>