BUG修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/course/CourseTableController.java

@@ -37,7 +37,6 @@ public class CourseTableController extends BaseController
     /**
      * 查询课程列表
      */
-    @PreAuthorize("@ss.hasPermi('course:table:list')")
     @GetMapping("/list")
     public TableDataInfo list(CourseTable courseTable)
     {
@@ -62,7 +61,6 @@ public class CourseTableController extends BaseController
     /**
      * 获取课程详细信息
      */
-    @PreAuthorize("@ss.hasPermi('course:table:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/course/CourseTableTimeController.java

@@ -37,7 +37,6 @@ public class CourseTableTimeController extends BaseController
     /**
      * 查询课程-时间列表
      */
-    @PreAuthorize("@ss.hasPermi('course:time:list')")
     @GetMapping("/list")
     public TableDataInfo list(CourseTableTime courseTableTime)
     {
@@ -62,7 +61,6 @@ public class CourseTableTimeController extends BaseController
     /**
      * 获取课程-时间详细信息
      */
-    @PreAuthorize("@ss.hasPermi('course:time:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterParentsController.java

@@ -62,7 +62,6 @@ public class RegisterParentsController extends BaseController
     /**
      * 获取注册-家长详细信息
      */
-    @PreAuthorize("@ss.hasPermi('register:parents:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterParentsStudentController.java

@@ -37,7 +37,6 @@ public class RegisterParentsStudentController extends BaseController
     /**
      * 查询注册-家长-学生列表
      */
-    @PreAuthorize("@ss.hasPermi('register:student:list')")
     @GetMapping("/list")
     public TableDataInfo list(RegisterParentsStudent registerParentsStudent)
     {
@@ -62,7 +61,6 @@ public class RegisterParentsStudentController extends BaseController
     /**
      * 获取注册-家长-学生详细信息
      */
-    @PreAuthorize("@ss.hasPermi('register:student:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -72,7 +70,6 @@ public class RegisterParentsStudentController extends BaseController
     /**
      * 新增注册-家长-学生
      */
-    @PreAuthorize("@ss.hasPermi('register:student:add')")
     @Log(title = "注册-家长-学生", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody RegisterParentsStudent registerParentsStudent)
@@ -83,7 +80,6 @@ public class RegisterParentsStudentController extends BaseController
     /**
      * 修改注册-家长-学生
      */
-    @PreAuthorize("@ss.hasPermi('register:student:edit')")
     @Log(title = "注册-家长-学生", businessType = BusinessType.UPDATE)
     @PostMapping("/put")
     public AjaxResult edit(@RequestBody RegisterParentsStudent registerParentsStudent)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterSchoolController.java

@@ -62,7 +62,6 @@ public class RegisterSchoolController extends BaseController
     /**
      * 获取注册-学校详细信息
      */
-    @PreAuthorize("@ss.hasPermi('register:school:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/register/RegisterTeacherClassController.java

@@ -62,7 +62,6 @@ public class RegisterTeacherClassController extends BaseController
     /**
      * 获取注册-老师-班级（学科）详细信息
      */
-    @PreAuthorize("@ss.hasPermi('register:class:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java

@@ -110,7 +110,7 @@ public class SysDeptController extends BaseController
     @GetMapping(value = "/{deptId}")
     public AjaxResult getInfo(@PathVariable Long deptId)
     {
-        deptService.checkDeptDataScope(deptId);
+        //deptService.checkDeptDataScope(deptId);
         return success(deptService.selectDeptById(deptId));
     }
 
@@ -151,12 +151,12 @@ public class SysDeptController extends BaseController
     public AjaxResult edit(@Validated @RequestBody SysDept dept)
     {
         Long deptId = dept.getDeptId();
-        deptService.checkDeptDataScope(deptId);
+        //deptService.checkDeptDataScope(deptId);
         if (!deptService.checkDeptNameUnique(dept))
         {
             return error("修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
-        else if (dept.getParentId().equals(deptId))
+        if (dept.getParentId().equals(deptId))
         {
             return error("修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
         }
@@ -184,7 +184,7 @@ public class SysDeptController extends BaseController
         {
             return warn("部门存在用户,不允许删除");
         }
-        deptService.checkDeptDataScope(deptId);
+        //deptService.checkDeptDataScope(deptId);
         return toAjax(deptService.deleteDeptById(deptId));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -94,7 +94,7 @@ public class SysLoginController
      * 
      * @return 用户信息
      */
-    @GetMapping("getInfo")
+    @GetMapping("/getInfo")
     public AjaxResult getInfo()
     {
         SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -102,6 +102,9 @@ public class SysLoginController
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
+        Long schoolId = 0L;
+
+
         //formal_teacher_class
         if (roles != null && roles.size() > 0){
             for (String role : roles) {
@@ -113,7 +116,15 @@ public class SysLoginController
                 }
             }
         }
+        if(user.getDeptId()!=null && user.getDeptId()!=0L){
+            schoolId = user.getDeptId();
+        }else{
+            if(user.getTeacherClass()!=null && user.getTeacherClass().size()>0){
+                schoolId = user.getTeacherClass().get(0).getSchoolId();
+            }
+        }
         AjaxResult ajax = AjaxResult.success();
+        ajax.put("schoolId", schoolId);
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);

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

@@ -112,9 +112,8 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .authorizeRequests()
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage","/weChatLogin","/weChatOpenid","/common/upload",
-                        //"/flowable/task/flowFormData","/flowable/task/flowXmlAndNode","/flowable/task/flowRecord","/flowable/task/nextFlowNodeByStart",
-                        "/flowable/definition/**","/register/school","/register/school/query","/system/dept/list/**",
-                        "/system/dict/data/type/**","/register/teacher","/register/teacher/put","/register/parents","/register/parents/put").permitAll()
+                        "/flowable/definition/**","/register/school/**","/system/dept/list/**",
+                        "/system/dict/data/type/**","/register/teacher/**","/register/parents/**","/register/student/**").permitAll()
                 // 静态资源，可匿名访问
                 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()

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

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.domain.CourseTableTime;
 import com.ruoyi.system.mapper.CourseTableTimeMapper;
 import lombok.SneakyThrows;
@@ -165,21 +166,21 @@ public class CourseTableServiceImpl implements ICourseTableService
         //获取当前时间
         String nowTime = DateUtils.getNowTime();
         int index = 0;
-        if(DateUtils.isClass(courseTableTime.getOneStartTime(),courseTableTime.getOneEndTime(),nowTime,"HH:mm")){
+        if(StringUtils.isNotEmpty(courseTableTime.getOneStartTime()) && DateUtils.isClass(courseTableTime.getOneStartTime(),courseTableTime.getOneEndTime(),nowTime,"HH:mm")){
             index = 1;
-        }else if(DateUtils.isClass(courseTableTime.getTwoStartTime(),courseTableTime.getTwoEndTime(),nowTime,"HH:mm")){
+        }else if(StringUtils.isNotEmpty(courseTableTime.getTwoStartTime()) && DateUtils.isClass(courseTableTime.getTwoStartTime(),courseTableTime.getTwoEndTime(),nowTime,"HH:mm")){
             index = 2;
-        }else if(DateUtils.isClass(courseTableTime.getThreeStartTime(),courseTableTime.getThreeEndTime(),nowTime,"HH:mm")){
+        }else if(StringUtils.isNotEmpty(courseTableTime.getThreeStartTime()) && DateUtils.isClass(courseTableTime.getThreeStartTime(),courseTableTime.getThreeEndTime(),nowTime,"HH:mm")){
             index = 3;
-        }else if(DateUtils.isClass(courseTableTime.getFourStartTime(),courseTableTime.getFourEndTime(),nowTime,"HH:mm")){
+        }else if(StringUtils.isNotEmpty(courseTableTime.getFourStartTime()) && DateUtils.isClass(courseTableTime.getFourStartTime(),courseTableTime.getFourEndTime(),nowTime,"HH:mm")){
             index = 4;
-        }else if(DateUtils.isClass(courseTableTime.getFiveStartTime(),courseTableTime.getFiveEndTime(),nowTime,"HH:mm")){
+        }else if(StringUtils.isNotEmpty(courseTableTime.getFiveStartTime()) && DateUtils.isClass(courseTableTime.getFiveStartTime(),courseTableTime.getFiveEndTime(),nowTime,"HH:mm")){
             index = 5;
-        }else if(DateUtils.isClass(courseTableTime.getSixStartTime(),courseTableTime.getSixEndTime(),nowTime,"HH:mm")){
+        }else if(StringUtils.isNotEmpty(courseTableTime.getSixStartTime()) && DateUtils.isClass(courseTableTime.getSixStartTime(),courseTableTime.getSixEndTime(),nowTime,"HH:mm")){
             index = 6;
-        }else if(DateUtils.isClass(courseTableTime.getSevenStartTime(),courseTableTime.getSevenEndTime(),nowTime,"HH:mm")){
+        }else if(StringUtils.isNotEmpty(courseTableTime.getSevenStartTime()) && DateUtils.isClass(courseTableTime.getSevenStartTime(),courseTableTime.getSevenEndTime(),nowTime,"HH:mm")){
             index = 7;
-        }else if(DateUtils.isClass(courseTableTime.getEightStartTime(),courseTableTime.getEightEndTime(),nowTime,"HH:mm")){
+        }else if(StringUtils.isNotEmpty(courseTableTime.getEightStartTime()) && DateUtils.isClass(courseTableTime.getEightStartTime(),courseTableTime.getEightEndTime(),nowTime,"HH:mm")){
             index = 8;
         }
         return index;

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

@@ -6,20 +6,15 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.RegisterParents;
-import com.ruoyi.system.domain.RegisterSchoolFile;
-import com.ruoyi.system.domain.RegisterTeacher;
-import com.ruoyi.system.mapper.RegisterParentsMapper;
-import com.ruoyi.system.mapper.RegisterSchoolFileMapper;
-import com.ruoyi.system.mapper.RegisterTeacherMapper;
+import com.ruoyi.system.domain.*;
+import com.ruoyi.system.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.h2.H2ConsoleAutoConfiguration;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.RegisterSchoolMapper;
-import com.ruoyi.system.domain.RegisterSchool;
 import com.ruoyi.system.service.IRegisterSchoolService;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -41,6 +36,11 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService
     @Autowired
     private RegisterParentsMapper registerParentsMapper;
 
+    @Autowired
+    private RegisterTeacherClassMapper registerTeacherClassMapper;
+    @Autowired
+    private RegisterParentsStudentMapper registerParentsStudentMapper;
+
     /**
      * 查询注册-学校
      * 
@@ -174,12 +174,38 @@ public class RegisterSchoolServiceImpl implements IRegisterSchoolService
         Map<String,Object> map = new HashMap<>();
         //查询学校里是否有注册信息
         RegisterSchool registerSchoolOld = registerSchoolMapper.selectRegisterSchooByOppenId(openId);
+        if(registerSchoolOld!=null){
+            RegisterSchoolFile registerSchoolFile = new RegisterSchoolFile();
+            registerSchoolFile.setSchoolId(registerSchoolOld.getId());
+            List<RegisterSchoolFile> registerSchoolFileList = registerSchoolFileMapper.selectRegisterSchoolFileList(registerSchoolFile);
+            registerSchoolOld.setRegisterSchoolFileList(registerSchoolFileList);
+        }else{
+            registerSchoolOld = new RegisterSchool();
+        }
         map.put("school",registerSchoolOld);
         //查询老师是否有注册信息
         RegisterTeacher registerTeacher = registerTeacherMapper.selectRegisterTeacherByOppenId(openId);
+        if(registerTeacher!=null){
+            RegisterTeacherClass registerTeacherClass = new RegisterTeacherClass();
+            registerTeacherClass.setTeacherId(registerTeacher.getId());
+            List<RegisterTeacherClass> registerTeacherClassList = registerTeacherClassMapper.selectRegisterTeacherClassList(registerTeacherClass);
+            registerTeacher.setRegisterTeacherClassList(registerTeacherClassList);
+        }else{
+            registerTeacher = new RegisterTeacher();
+        }
+
         map.put("teacher",registerTeacher);
         //查询家长注册信息
         RegisterParents registerParents = registerParentsMapper.selectRegisterParentsByOppenId(openId);
+        if(registerParents!=null){
+            RegisterParentsStudent registerParentsStudent = new RegisterParentsStudent();
+            registerParentsStudent.setParentsId(registerParents.getId());
+            List<RegisterParentsStudent> registerParentsStudentList = registerParentsStudentMapper.selectRegisterParentsStudentList(registerParentsStudent);
+            registerParents.setRegisterParentsStudentList(registerParentsStudentList);
+        }else{
+            registerParents = new RegisterParents();
+        }
+
         map.put("parents",registerParents);
         return AjaxResult.success(map);
     }

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

@@ -4,7 +4,14 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.FormalTeacherClass;
 import com.ruoyi.common.core.domain.entity.vo.SysDeptVo;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.XiakeConfig;
+import com.ruoyi.system.domain.XiaoyuanNotice;
+import com.ruoyi.system.mapper.XiakeConfigMapper;
+import com.ruoyi.system.mapper.XiaoyuanNoticeMapper;
+import com.ruoyi.system.service.IFormalTeacherClassService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.annotation.DataScope;
@@ -36,6 +43,12 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Autowired
     private SysRoleMapper roleMapper;
 
+    @Autowired
+    private XiakeConfigMapper configMapper;
+
+    @Autowired
+    private IFormalTeacherClassService formalTeacherClassService;
+
     /**
      * 查询部门管理数据
      * 
@@ -43,9 +56,20 @@ public class SysDeptServiceImpl implements ISysDeptService
      * @return 部门信息集合
      */
     @Override
-    @DataScope(deptAlias = "d")
+    //@DataScope(deptAlias = "d")
     public List<SysDept> selectDeptList(SysDept dept)
     {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        if(!"admin".equals(user.getUserName())){
+            dept.setParentId(user.getDeptId());
+            dept.setDeptId(user.getDeptId());
+            if(user.getDeptId()==null || user.getDeptId() == 0L){
+                List<FormalTeacherClass> teacherClass = formalTeacherClassService.getTeacherClass(String.valueOf(user.getUserId()));
+                dept.setParentId(teacherClass.get(0).getSchoolId());
+                dept.setDeptId(teacherClass.get(0).getSchoolId());
+            }
+
+        }
         return deptMapper.selectDeptList(dept);
     }
 
@@ -58,7 +82,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public List<TreeSelect> selectDeptTreeList(SysDept dept)
     {
-        List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
+        List<SysDept> depts = selectDeptList(dept);
         return buildDeptTreeSelect(depts);
     }
 
@@ -221,6 +245,23 @@ public class SysDeptServiceImpl implements ISysDeptService
                 throw new ServiceException("部门停用，不允许新增");
             }
             dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+
+            //往xiake_config插入数据
+            XiakeConfig config = new XiakeConfig();
+            config.setConfigName("下课时间");
+            config.setConfigKey(info.getDeptId()+":1");
+            config.setConfigValue("5");
+            config.setCreateTime(DateUtils.getNowDate());
+            config.setUpdateTime(DateUtils.getNowDate());
+            configMapper.insertConfig(config);
+            XiakeConfig config1 = new XiakeConfig();
+            config1.setConfigName("延迟下课");
+            config1.setConfigKey(info.getDeptId()+":2");
+            config1.setConfigValue("5");
+            config1.setCreateTime(DateUtils.getNowDate());
+            config1.setUpdateTime(DateUtils.getNowDate());
+            configMapper.insertConfig(config1);
+
         }else{
             dept.setAncestors(String.valueOf(dept.getParentId()));
         }
@@ -320,6 +361,23 @@ public class SysDeptServiceImpl implements ISysDeptService
                 //新增
                 sysDept.setOrderNum(num+1);
                 deptMapper.insertDept(sysDept);
+
+                //往xiake_config插入数据
+                XiakeConfig config = new XiakeConfig();
+                config.setConfigName("下课时间");
+                config.setConfigKey(sysDept.getDeptId()+":1");
+                config.setConfigValue("5");
+                config.setCreateTime(DateUtils.getNowDate());
+                config.setUpdateTime(DateUtils.getNowDate());
+                configMapper.insertConfig(config);
+                XiakeConfig config1 = new XiakeConfig();
+                config1.setConfigName("延迟下课");
+                config1.setConfigKey(sysDept.getDeptId()+":2");
+                config1.setConfigValue("5");
+                config1.setCreateTime(DateUtils.getNowDate());
+                config1.setUpdateTime(DateUtils.getNowDate());
+                configMapper.insertConfig(config1);
+
             }
         }
         Long[] skuIds = deptIds.toArray(new Long[deptIds.size()]);

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

@@ -124,8 +124,24 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService
                 dept.setPhone(registerSchool.getUserPhone());
                 dept.setCreateTime(DateUtils.getNowDate());
                 deptMapper.insertDept(dept);
+                //判断是否存在账号
+                SysUser use = userMapper.getByOpenId(registerSchool.getOpenId());
+                if(use==null){
+                    use = new SysUser();
+                    //生成账号
+                    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);
+                }else{
+                    use.setDeptId(dept.getDeptId());
+                    userMapper.updateUser(use);
+                }
                 //生成账号
-                SysUser use = new SysUser();
                 use.setOpenId(registerSchool.getOpenId());
                 use.setDeptId(dept.getDeptId());
                 use.setUserName(registerSchool.getUserPhone());
@@ -201,7 +217,7 @@ public class ZhxyShyjServiceImpl implements IZhxyShyjService
                 //不通过  修改注册表审核结果
                 //修改注册表审核结果
                 RegisterTeacher registerTeacher = new RegisterTeacher();
-                registerTeacher.setId(zhxyShyj.getId());
+                registerTeacher.setId(zhxyShyj.getDataId());
                 registerTeacher.setAuditId(user.getUserId());
                 registerTeacher.setAuditUser(user.getNickName());
                 registerTeacher.setOpinion(zhxyShyj.getShyj());

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

@@ -40,8 +40,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectCourseTableList" parameterType="CourseTable" resultMap="CourseTableResult">
         <include refid="selectCourseTableVo"/>
-        <where>  
+        <where>
+            <if test="schoolId != null  and schoolId != 0"> and school_id = #{schoolId}</if>
             <if test="schoolName != null  and schoolName != ''"> and school_name like concat('%', #{schoolName}, '%')</if>
+            <if test="classId != null  and classId != 0"> and class_id = #{classId}</if>
             <if test="className != null  and className != ''"> and class_name like concat('%', #{className}, '%')</if>
             <if test="week != null  and week != ''"> and week = #{week}</if>
             <if test="oneClass != null  and oneClass != ''"> and one_class = #{oneClass}</if>

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

@@ -30,12 +30,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
+		<if test="parentId != null and parentId != 0">
+			AND (dept_id = #{deptId} or parent_id = #{parentId})
 		</if>
-        <if test="parentId != null and parentId != 0">
+        <!--<if test="parentId != null and parentId != 0">
 			AND parent_id = #{parentId}
-		</if>
+		</if>-->
 		<if test="deptName != null and deptName != ''">
 			AND dept_name like concat('%', #{deptName}, '%')
 		</if>