BUG修改

ruoyi-admin/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
+    <artifactId>zhihuixiaoyuan</artifactId>
 
     <description>
         web服务入口

ruoyi-admin/src/main/resources/application-prod.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 ruoyi:
     # 名称
-    name: 潜山招商管理系统
+    name: 智慧校园
     # 版本
     version: 3.4.0
     # 版权年份
@@ -41,7 +41,7 @@ spring:
         # 数据库索引
         database: 9
         # 密码
-        password: D3fQYAsw
+        password: 3r263Tr$
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -54,15 +54,16 @@ spring:
                 max-active: 8
                 # #连接池最大阻塞等待时间（使用负值表示没有限制）
                 max-wait: -1ms
+
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
         driverClassName: com.mysql.cj.jdbc.Driver
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://127.0.0.1:3306/zhihuixiaoyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://127.0.0.1:3306/zhihuixiaoyuan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
                 username: root
-                password: zhaoshang@2018
+                password: UEB^RX$z
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -78,6 +79,10 @@ spring:
             maxActive: 20
             # 配置获取连接等待超时的时间
             maxWait: 60000
+            # 配置连接超时时间
+            connectTimeout: 30000
+            # 配置网络超时时间
+            socketTimeout: 60000
             # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
             timeBetweenEvictionRunsMillis: 60000
             # 配置一个连接在池中最小生存的时间，单位是毫秒
@@ -92,13 +97,13 @@ spring:
             webStatFilter:
                 enabled: true
             statViewServlet:
-                enabled: false
+                enabled: true
                 # 设置白名单，不填则允许所有访问
                 allow:
                 url-pattern: /druid/*
                 # 控制台管理用户名和密码
-                login-username:
-                login-password:
+                login-username: ruoyi
+                login-password: 123456
             filter:
                 stat:
                     enabled: true

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysPermissionService.java

@@ -86,7 +86,7 @@ public class SysPermissionService
         else
         {
             List<SysRole> roles = user.getRoles();
-            if (!roles.isEmpty() && roles.size() > 1)
+            if (!roles.isEmpty() && roles.size() > 0)
             {
                 // 多角色设置permissions属性，以便数据权限匹配权限
                 for (SysRole role : roles)

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

@@ -58,4 +58,6 @@ public interface FormalParentsStudentMapper
      * @return 结果
      */
     public int deleteFormalParentsStudentByIds(Long[] ids);
+
+    void deleteFormalParentsStudentByParentsId(Long userId);
 }

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

@@ -60,4 +60,6 @@ public interface RegisterSchoolMapper
     public int deleteRegisterSchoolByIds(Long[] ids);
 
     RegisterSchool selectRegisterSchooByOppenId(String openId);
+
+    void deleteRegisterSchoolByOpenId(String openId);
 }

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

@@ -140,6 +140,7 @@ public class CourseChangeServiceImpl implements ICourseChangeService {
         courseChange.setAuditId(user.getUserId());
         courseChange.setAuditUser(user.getNickName());
         courseChange.setCreateTime(DateUtils.getNowDate());
+        courseChangeMapper.updateCourseChange(courseChange);
         return AjaxResult.success();
     }
 }

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

@@ -28,6 +28,7 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.mapper.SysDeptMapper;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import com.ruoyi.system.service.ISysDeptService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 部门管理 服务实现
@@ -234,10 +235,12 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 结果
      */
     @Override
+    @Transactional
     public int insertDept(SysDept dept)
     {
 
         SysDept info = deptMapper.selectDeptById(dept.getParentId());
+        int index = 0;
         if(info!=null){
             // 如果父节点不为正常状态,则不允许新增子节点
             if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
@@ -245,28 +248,31 @@ public class SysDeptServiceImpl implements ISysDeptService
                 throw new ServiceException("部门停用，不允许新增");
             }
             dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
-
+            index = deptMapper.insertDept(dept);
             //往xiake_config插入数据
             XiakeConfig config = new XiakeConfig();
             config.setConfigName("下课时间");
-            config.setConfigKey(info.getDeptId()+":1");
+            config.setConfigKey(dept.getDeptId()+":1");
             config.setConfigValue("5");
+            config.setConfigType("1");
             config.setCreateTime(DateUtils.getNowDate());
             config.setUpdateTime(DateUtils.getNowDate());
             configMapper.insertConfig(config);
             XiakeConfig config1 = new XiakeConfig();
             config1.setConfigName("延迟下课");
-            config1.setConfigKey(info.getDeptId()+":2");
+            config1.setConfigKey(dept.getDeptId()+":2");
             config1.setConfigValue("5");
+            config.setConfigType("2");
             config1.setCreateTime(DateUtils.getNowDate());
             config1.setUpdateTime(DateUtils.getNowDate());
             configMapper.insertConfig(config1);
 
         }else{
             dept.setAncestors(String.valueOf(dept.getParentId()));
+            index = deptMapper.insertDept(dept);
         }
 
-        return deptMapper.insertDept(dept);
+        return index;
     }
 
     /**
@@ -367,6 +373,7 @@ public class SysDeptServiceImpl implements ISysDeptService
                 config.setConfigName("下课时间");
                 config.setConfigKey(sysDept.getDeptId()+":1");
                 config.setConfigValue("5");
+                config.setConfigType("1");
                 config.setCreateTime(DateUtils.getNowDate());
                 config.setUpdateTime(DateUtils.getNowDate());
                 configMapper.insertConfig(config);
@@ -374,6 +381,7 @@ public class SysDeptServiceImpl implements ISysDeptService
                 config1.setConfigName("延迟下课");
                 config1.setConfigKey(sysDept.getDeptId()+":2");
                 config1.setConfigValue("5");
+                config.setConfigType("2");
                 config1.setCreateTime(DateUtils.getNowDate());
                 config1.setUpdateTime(DateUtils.getNowDate());
                 configMapper.insertConfig(config1);

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

@@ -4,6 +4,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.mapper.*;
+import com.ruoyi.system.service.IRegisterTeacherClassService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,14 +23,6 @@ import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanValidators;
 import com.ruoyi.common.utils.spring.SpringUtils;
-import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.domain.SysUserPost;
-import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.mapper.SysPostMapper;
-import com.ruoyi.system.mapper.SysRoleMapper;
-import com.ruoyi.system.mapper.SysUserMapper;
-import com.ruoyi.system.mapper.SysUserPostMapper;
-import com.ruoyi.system.mapper.SysUserRoleMapper;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.system.service.ISysUserService;
 
@@ -61,6 +57,23 @@ public class SysUserServiceImpl implements ISysUserService
     @Autowired
     protected Validator validator;
 
+    @Autowired
+    private RegisterParentsStudentMapper registerParentsStudentMapper;
+    @Autowired
+    private RegisterParentsMapper registerParentsMapper;
+    @Autowired
+    private RegisterTeacherClassMapper registerTeacherClassMapper;
+    @Autowired
+    private RegisterTeacherMapper registerTeacherMapper;
+    @Autowired
+    private RegisterSchoolMapper registerSchoolMapper;
+    @Autowired
+    private RegisterSchoolFileMapper registerSchoolFileMapper;
+    @Autowired
+    private FormalParentsStudentMapper formalParentsStudentMapper;
+    @Autowired
+    private FormalTeacherClassMapper formalTeacherClassMapper;
+
     /**
      * 根据条件分页查询用户列表
      * 
@@ -473,6 +486,32 @@ public class SysUserServiceImpl implements ISysUserService
         {
             checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);
+            //删除注册表
+            //获取openId
+            SysUser user = userMapper.selectUserById(userId);
+            if(StringUtils.isNotEmpty(user.getOpenId())){
+                //删除学校表
+                registerSchoolMapper.deleteRegisterSchoolByOpenId(user.getOpenId());
+                //查询老师表
+                RegisterTeacher registerTeacher = registerTeacherMapper.selectRegisterTeacherByOppenId(user.getOpenId());
+                if(registerTeacher!=null){
+                    //删除老师表
+                    registerTeacherClassMapper.deleteRegisterTeacherClassByTeacherId(registerTeacher.getId());
+                    registerTeacherMapper.deleteRegisterTeacherById(registerTeacher.getId());
+                }
+
+                //删除学生数据
+                RegisterParents registerParents = registerParentsMapper.selectRegisterParentsByOppenId(user.getOpenId());
+                if(registerParents!=null){
+                    //删除学生数据
+                    registerParentsMapper.deleteRegisterParentsById(registerParents.getId());
+                    registerParentsStudentMapper.deleteRegisterParentsStudentByParentsId(registerParents.getId());
+                    formalParentsStudentMapper.deleteFormalParentsStudentByParentsId(userId);
+                    formalTeacherClassMapper.deleteFormalTeacherClassByTeacherId(userId);
+                }
+
+            }
+            
         }
         // 删除用户与角色关联
         userRoleMapper.deleteUserRole(userIds);

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

@@ -141,15 +141,6 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService
                     use.setDeptId(dept.getDeptId());
                     userMapper.updateUser(use);
                 }
-                //生成账号
-                use.setOpenId(registerSchool.getOpenId());
-                use.setDeptId(dept.getDeptId());
-                use.setUserName(registerSchool.getUserPhone());
-                use.setNickName(registerSchool.getSchoolName());
-                use.setPhonenumber(registerSchool.getUserPhone());
-                use.setPassword(SecurityUtils.encryptPassword("1qaz!QAZ"));
-                use.setCreateTime(DateUtils.getNowDate());
-                userMapper.insertUser(use);
                 //新增用户与角色管理
                 Long[] roleIds = {4L};
                 sysUserServiceImpl.insertUserRole(use.getUserId(), roleIds);

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

@@ -103,4 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteFormalParentsStudentByParentsId">
+        delete from formal_parents_student where parents_id = #{userId}
+    </delete>
 </mapper>

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

@@ -111,4 +111,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{id}
         </foreach>
     </delete>
+    <delete id="deleteRegisterSchoolByOpenId">
+        delete from register_school where open_id  = #{openId}
+    </delete>
 </mapper>

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

@@ -151,7 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="getByOpenId" resultMap="SysUserResult" parameterType="String">
 		<include refid="selectUserVo"/>
-		where u.open_id = #{openId}
+		where u.open_id = #{openId} and u.del_flag = '0'
 	</select>
 
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">