Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -130,6 +130,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 //wx信息采集相关接口放行
                 //wx信息采集相关接口放行
                 .antMatchers("/wx/schoolInfo/**").permitAll()
                 .antMatchers("/wx/schoolInfo/**").permitAll()
                 .antMatchers("/wx/user/getToken").permitAll()
                 .antMatchers("/wx/user/getToken").permitAll()
+                //钉钉免登录接口
+                .antMatchers("/dd/App/user/**").permitAll()
                 //开发一个接口字典
                 //开发一个接口字典
                 .antMatchers("/system/dict/data/type/**").permitAll()
                 .antMatchers("/system/dict/data/type/**").permitAll()
 //                .antMatchers("/**").permitAll()
 //                .antMatchers("/**").permitAll()

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java

@@ -20,6 +20,8 @@ public interface SysUserMapper {
      */
      */
     public List<SysUser> selectUserList(SysUser sysUser);
     public List<SysUser> selectUserList(SysUser sysUser);
 
 
+    public List<SysUser> selectUserListTypeLogin(SysUser sysUser);
+
     /**
     /**
      * 根据条件分页查询已配用户角色列表
      * 根据条件分页查询已配用户角色列表
      *
      *

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -74,7 +74,13 @@ public class SysUserServiceImpl implements ISysUserService {
     public List<SysUser> selectUserList(SysUser user) {
     public List<SysUser> selectUserList(SysUser user) {
         return userMapper.selectUserList(user);
         return userMapper.selectUserList(user);
     }
     }
+    public List<SysUser> selectUserTypeList(SysUser user) {
+        return userMapper.selectUserList(user);
+    }
 
 
+    public List<SysUser> selectUserListTypeLogin(SysUser user) {
+        return userMapper.selectUserListTypeLogin(user);
+    }
     /**
     /**
      * 根据条件分页查询已分配用户角色列表
      * 根据条件分页查询已分配用户角色列表
      *
      *

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -94,6 +94,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		${params.dataScope}
 		${params.dataScope}
 	</select>
 	</select>
 
 
+
+	<select id="selectUserListTypeLogin" parameterType="SysUser" resultMap="SysUserResult">
+		select u.user_id, u.dept_id, u.login_name, u.user_name,u.user_type, u.user_login_type, u.email, u.avatar, u.phonenumber, u.sex,u.salt,u.student_id, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		left join sys_dept d on u.dept_id = d.dept_id
+		where u.del_flag = '0'
+		<if test="userLoginType != null and userLoginType != 0">
+			AND u.user_login_type = #{userLoginType}
+		</if>
+		<if test="userId != null and userId != 0">
+			AND u.user_id = #{userId}
+		</if>
+		<if test="userName != null and userName != ''">
+			AND u.user_name like concat('%', #{userName}, '%')
+		</if>
+		<if test="status != null and status != ''">
+			AND u.status = #{status}
+		</if>
+		<if test="phonenumber != null and phonenumber != ''">
+			AND u.phonenumber like concat('%', #{phonenumber}, '%')
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+		</if>
+		<if test="deptId != null and deptId != 0">
+			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
+		</if>
+	</select>
+
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.login_name, u.user_type,u.email, u.phonenumber, u.status, u.create_time
 	    select distinct u.user_id, u.dept_id, u.user_name, u.login_name, u.user_type,u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
 	    from sys_user u

smart-campus/src/main/java/yangtz/cs/liu/campus/vo/teacher/SchoolTeacherVO.java

@@ -110,6 +110,11 @@ public class SchoolTeacherVO extends OurBaseEntity {
 
 
     private Long userId;
     private Long userId;
 
 
+    private String ddUserId;
+
+
+    private String unionId;
+
     /** 帐号状态（0正常 1停用） */
     /** 帐号状态（0正常 1停用） */
     //@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     //@Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
     private String status;

smart-campus/src/main/java/yangtz/cs/liu/wechat/service/api/IWxLoginService.java

@@ -13,4 +13,5 @@ public interface IWxLoginService {
      * 用户登录
      * 用户登录
      */
      */
     MpLoginUser login(WxLoginBody wxLoginBody);
     MpLoginUser login(WxLoginBody wxLoginBody);
+    MpLoginUser ddApplogin(WxLoginBody wxLoginBody);
 }
 }

smart-campus/src/main/java/yangtz/cs/liu/wechat/service/impl/api/WxLoginServiceImpl.java

@@ -46,7 +46,61 @@ public class WxLoginServiceImpl implements IWxLoginService {
 
 
 
 
     private Logger log = LoggerFactory.getLogger(WxLoginServiceImpl.class);
     private Logger log = LoggerFactory.getLogger(WxLoginServiceImpl.class);
+    @Override
+    public MpLoginUser ddApplogin(WxLoginBody wxLoginBody) {
+        MpLoginUser mpLoginUser = null;
+        if (TEACHER_LOGIN.equals(wxLoginBody.getType())) {
+            SysUser sysUser = new SysUser();
+            sysUser.setUserLoginType(TEACHER_LOGIN);
+            sysUser.setPhonenumber(wxLoginBody.getPhonenumber());
+            SysUser user = userMapper.getUser(sysUser);
+            // 教职工登录
+            mpLoginUser = loadUserB(wxLoginBody, user);
+        } else if (PARENT_LOGIN.equals(wxLoginBody.getType())) {
+            SchoolStudentParent schoolStudentParent = schoolStudentParentMapper.selectUserByParentTel(wxLoginBody.getParentTelephone(), wxLoginBody.getStudentIdCard());
+            if(StringUtils.isNull(schoolStudentParent)){
+                throw new ServiceException("学生身份证号或家长手机号输入有误，请检查后重试");
+            }
+            mpLoginUser = loadUserByParent(wxLoginBody, schoolStudentParent);
+        }
+        return mpLoginUser;
+    }
 
 
+    public MpLoginUser loadUserB(WxLoginBody wxLoginBody, SysUser user) {
+        if (StringUtils.isNull(user)) {
+            throw new ServiceException("登录用户：" + wxLoginBody.getPhonenumber() + " 不存在");
+        }
+        if (UserStatus.DISABLE.getCode().equals(user.getDelFlag())) {
+            throw new ServiceException("对不起，登录用户：" + wxLoginBody.getPhonenumber() + " 已被删除");
+        } else if (UserStatus.DISABLE.getCode().equals(user.getStatus())) {
+            throw new ServiceException("对不起，登录用户：" + wxLoginBody.getPhonenumber() + " 已停用");
+        }
+        LambdaQueryWrapper<SchoolTeacher> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(SchoolTeacher::getId, user.getUserId());
+        SchoolTeacher schoolTeacher = schoolTeacherMapper.selectOne(lqw);
+        MpLoginUser loginUser = new MpLoginUser();
+        loginUser.setOpenId(wxLoginBody.getOpenId());
+        loginUser.setType(TEACHER_LOGIN);
+        loginUser.setEmployeeType(user.getEmployeeType());
+        loginUser.setUserId(user.getUserId());
+        loginUser.setTeacherId(schoolTeacher.getId());
+        loginUser.setTeacherName(schoolTeacher.getTeacherName());
+        loginUser.setTeacherIdCard(schoolTeacher.getIdCard());
+        loginUser.setTeacherPhonenumber(schoolTeacher.getTeacherTel());
+        loginUser.setAvatar(user.getAvatar());
+
+        /** 更新老师openId */
+        schoolTeacher.setOpenId(wxLoginBody.getOpenId());
+        schoolTeacherMapper.updateById(schoolTeacher);
+
+        /** 更新用户表openId */
+        SysUser sysUser = new SysUser();
+        sysUser.setUserId(user.getUserId());
+        sysUser.setOpenId(wxLoginBody.getOpenId());
+        userMapper.updateUser(sysUser);
+
+        return loginUser;
+    }
     @Override
     @Override
     public MpLoginUser login(WxLoginBody wxLoginBody) {
     public MpLoginUser login(WxLoginBody wxLoginBody) {
         MpLoginUser mpLoginUser = null;
         MpLoginUser mpLoginUser = null;