排课代码提交

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseOpenController.java

@@ -12,7 +12,6 @@
  */
 package vip.xiaonuo.disk.controller;
 
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -20,14 +19,10 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
-import vip.xiaonuo.disk.domain.CourseInfo;
 import vip.xiaonuo.disk.domain.CourseOpen;
 import vip.xiaonuo.disk.param.courseopen.CourseOpenAddParam;
 import vip.xiaonuo.disk.param.courseopen.CourseOpenEditParam;
@@ -40,6 +35,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -65,7 +61,6 @@ public class CourseOpenController {
      */
     @ApiOperationSupport(order = 1)
     @ApiOperation("获取课程开课表分页")
-    @SaCheckPermission("/disk/courseopen/page")
     @GetMapping("/disk/courseopen/page")
     public CommonResult<Page<Map<String,Object>>> page(CourseOpenPageParam courseOpenPageParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -82,7 +77,6 @@ public class CourseOpenController {
     @ApiOperationSupport(order = 2)
     @ApiOperation("添加课程开课表")
     @CommonLog("添加课程开课表")
-    @SaCheckPermission("/disk/courseopen/add")
     @PostMapping("/disk/courseopen/add")
     public CommonResult<String> add(@RequestBody @Valid CourseOpenAddParam courseOpenAddParam) {
         CourseOpen courseOpen = BeanUtil.toBean(courseOpenAddParam, CourseOpen.class);
@@ -99,7 +93,6 @@ public class CourseOpenController {
     @ApiOperationSupport(order = 3)
     @ApiOperation("编辑课程开课表")
     @CommonLog("编辑课程开课表")
-    @SaCheckPermission("/disk/courseopen/edit")
     @PostMapping("/disk/courseopen/edit")
     public CommonResult<String> edit(@RequestBody @Valid CourseOpenEditParam courseOpenEditParam) {
         CourseOpen courseOpen = BeanUtil.toBean(courseOpenEditParam, CourseOpen.class);
@@ -116,7 +109,6 @@ public class CourseOpenController {
     @ApiOperationSupport(order = 4)
     @ApiOperation("删除课程开课表")
     @CommonLog("删除课程开课表")
-    @SaCheckPermission("/disk/courseopen/delete")
     @PostMapping("/disk/courseopen/delete")
     public CommonResult<String> delete(@RequestBody @Valid @NotEmpty(message = "集合不能为空")
                                                    CommonValidList<CourseOpenIdParam> courseOpenIdParamList) {
@@ -132,7 +124,6 @@ public class CourseOpenController {
      */
     @ApiOperationSupport(order = 5)
     @ApiOperation("获取课程开课表详情")
-    @SaCheckPermission("/disk/courseopen/detail")
     @GetMapping("/disk/courseopen/detail")
     public CommonResult<Map<String,Object>> detail(@Valid CourseOpenIdParam courseOpenIdParam, HttpServletRequest req) {
         Map param =new HashMap();
@@ -141,4 +132,22 @@ public class CourseOpenController {
         return CommonResult.data(result);
     }
 
+
+    /**
+     * 根据学期id查询课程id
+     * @param semesterId
+     * @return
+     */
+    @ApiOperationSupport(order = 1)
+    @ApiOperation("根据学期id查询课程id")
+    @GetMapping("/disk/courseopen/queryCourseList")
+    public CommonResult<List<Map<String,Object>>> page(@RequestParam("semesterId") String semesterId) {
+        return CommonResult.data(courseOpenService.queryCourseList(semesterId));
+    }
+
+
+
+
+
+
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CourseOpen.java

@@ -16,7 +16,7 @@ import com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import java.math.BigDecimal;
+
 import java.util.Date;
 
 /**
@@ -57,11 +57,11 @@ public class CourseOpen {
 
     /** 上课时间 */
     @ApiModelProperty(value = "上课时间", position = 7)
-    private String scheduleTime;
+    private Date scheduleTime;
 
     /** 开始节次 */
     @ApiModelProperty(value = "开始节次", position = 8)
-    private String strartPeriod;
+    private String startPeriod;
 
     /** 结束节次 */
     @ApiModelProperty(value = "结束节次", position = 9)

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/CourseOpenMapper.java

@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.disk.domain.CourseOpen;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -36,4 +37,8 @@ public interface CourseOpenMapper extends BaseMapper<CourseOpen> {
      * 课程开课-详情
      */
     Map<String,Object> queryInfo(Map param);
+
+    List<Map<String, Object>> queryCourseList(String semesterId);
+
+    List<String> selectAccount(@Param("semesterId") String semesterId, @Param("courseId") String courseId);
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseOpenMapper.xml

@@ -42,4 +42,31 @@
                  LEFT JOIN SEMESTER s ON s.ID =co.SEMESTER_ID AND s.DELETE_FLAG ='NOT_DELETE'
         WHERE co.DELETE_FLAG ='NOT_DELETE'
     </select>
+
+
+    <select id="queryCourseList" resultType="map">
+        SELECT
+            a.COURSE_ID courseId,
+            b.COURSE_NAME courseName
+        FROM
+            COURSE_OPEN a
+                LEFT JOIN COURSE_INFO b ON
+                a.COURSE_ID = b.COURSE_ID
+        WHERE
+            a.SEMESTER_ID = #{semesterId}
+        ORDER BY
+            a.id
+    </select>
+  <select id="selectAccount" resultType="string">
+      SELECT
+         distinct b.ACCOUNT
+      FROM
+          COURSE_OPEN a
+      LEFT JOIN SYS_USER b ON  a.GRADES_ID = b.GRADES_ID
+      WHERE
+          a.SEMESTER_ID = #{semesterId}
+        AND a.COURSE_ID = #{courseId}
+  </select>
+
+
 </mapper>

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/courseopen/CourseOpenAddParam.java

@@ -16,9 +16,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -53,11 +50,11 @@ public class CourseOpenAddParam {
 
     /** 上课时间 */
     @ApiModelProperty(value = "上课时间", position = 7)
-    private String scheduleTime;
+    private Date scheduleTime;
 
     /** 开始节次 */
     @ApiModelProperty(value = "开始节次", position = 8)
-    private String strartPeriod;
+    private String startPeriod;
 
     /** 结束节次 */
     @ApiModelProperty(value = "结束节次", position = 9)

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/courseopen/CourseOpenEditParam.java

@@ -17,8 +17,6 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -58,7 +56,7 @@ public class CourseOpenEditParam {
 
     /** 上课时间 */
     @ApiModelProperty(value = "上课时间", position = 7)
-    private String scheduleTime;
+    private Date scheduleTime;
 
     /** 开始节次 */
     @ApiModelProperty(value = "开始节次", position = 8)

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/CourseOpenService.java

@@ -14,7 +14,6 @@ package vip.xiaonuo.disk.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import vip.xiaonuo.disk.domain.CourseNotes;
 import vip.xiaonuo.disk.domain.CourseOpen;
 import vip.xiaonuo.disk.param.courseopen.CourseOpenAddParam;
 import vip.xiaonuo.disk.param.courseopen.CourseOpenEditParam;
@@ -106,5 +105,10 @@ public interface CourseOpenService extends IService<CourseOpen> {
      *  课程开课-详情
      */
     Map<String,Object> queryInfo(Map param);
-
+    /**
+     * 根据学期id查询课程id
+     * @param semesterId
+     * @return
+     */
+    List<Map<String,Object>> queryCourseList(String semesterId);
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/CourseOpenServiceImpl.java

@@ -14,6 +14,7 @@ package vip.xiaonuo.disk.modular.courseopen.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -21,10 +22,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
 import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
-import vip.xiaonuo.disk.domain.CourseNotes;
 import vip.xiaonuo.disk.domain.CourseOpen;
 import vip.xiaonuo.disk.mapper.CourseOpenMapper;
 import vip.xiaonuo.disk.param.courseopen.CourseOpenAddParam;
@@ -34,6 +35,7 @@ import vip.xiaonuo.disk.param.courseopen.CourseOpenPageParam;
 import vip.xiaonuo.disk.service.CourseOpenService;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -66,12 +68,18 @@ public class CourseOpenServiceImpl extends ServiceImpl<CourseOpenMapper, CourseO
     @Override
     public void add(CourseOpenAddParam courseOpenAddParam) {
         CourseOpen courseOpen = BeanUtil.toBean(courseOpenAddParam, CourseOpen.class);
+        courseOpen.setId(IdUtil.getSnowflakeNextIdStr());
+        courseOpen.setCreateUser(StpLoginUserUtil.getLoginUser().getId());
+        courseOpen.setCreateTime(new Date());
         this.save(courseOpen);
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public CourseOpen addOne(CourseOpen courseOpen) {
+        courseOpen.setId(IdUtil.getSnowflakeNextIdStr());
+        courseOpen.setCreateUser(StpLoginUserUtil.getLoginUser().getId());
+        courseOpen.setCreateTime(new Date());
         this.save(courseOpen);
         return courseOpen;
     }
@@ -81,6 +89,8 @@ public class CourseOpenServiceImpl extends ServiceImpl<CourseOpenMapper, CourseO
     public void edit(CourseOpenEditParam courseOpenEditParam) {
         CourseOpen courseOpen = this.queryEntity(courseOpenEditParam.getId());
         BeanUtil.copyProperties(courseOpenEditParam, courseOpen);
+        courseOpen.setUpdateUser(StpLoginUserUtil.getLoginUser().getId());
+        courseOpen.setUpdateTime(new Date());
         this.updateById(courseOpen);
     }
 
@@ -125,4 +135,10 @@ public class CourseOpenServiceImpl extends ServiceImpl<CourseOpenMapper, CourseO
         return courseOpenMapper.queryInfo(param);
     }
 
+    @Override
+    public List<Map<String,Object>> queryCourseList(String semesterId) {
+        return courseOpenMapper.queryCourseList(semesterId);
+    }
+
+
 }

snowy-plugin/snowy-plugin-exam/snowy-plugin-exam-func/src/main/java/vip/xiaonuo/exam/service/impl/TExamServiceImpl.java

@@ -27,6 +27,7 @@ import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.dev.api.DevJobApi;
 import vip.xiaonuo.disk.api.NetDiskApi;
+import vip.xiaonuo.disk.mapper.CourseOpenMapper;
 import vip.xiaonuo.exam.domain.ExamPaper;
 import vip.xiaonuo.exam.domain.TExam;
 import vip.xiaonuo.exam.domain.enums.ExamPaperTypeEnum;
@@ -74,6 +75,12 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
 
     @Resource
     private ExamPaperMapper examPaperMapper;
+
+
+    @Resource
+    private CourseOpenMapper courseOpenMapper;
+
+
     @Override
     public Page<TExamVo> page(TExamPageParam tExamPageParam) {
         Page<TExamVo> page = tExamMapper.queryList(CommonPageRequest.defaultPage(), tExamPageParam);
@@ -103,16 +110,9 @@ public class TExamServiceImpl extends ServiceImpl<TExamMapper, TExam> implements
             query = true;
         }
         if(query){
-            JSONObject students = netDiskApi.downList(map);
-            if(students != null && students.getIntValue("code") == 200){
-                List<String> studentIds = new ArrayList<String>();
-                if(!students.getJSONObject("data").getJSONArray("records").isEmpty()){
-                    students.getJSONObject("data").getJSONArray("records").forEach(item -> {
-                        JSONObject student = (JSONObject) item;
-                        studentIds.add(student.getString("ACCOUNT"));
-                    });
-                }
-                String studentIdsStr = String.join(",", studentIds);
+            List<String>  studentAccounts=courseOpenMapper.selectAccount(tExamAddParam.getSemesterId(),tExamAddParam.getCourseId());
+            if(studentAccounts != null){
+                String studentIdsStr = String.join(",", studentAccounts);
                 tExam.setStudentIds(studentIdsStr);
             }else{
                 throw new CommonException("没有找到学生信息!!!");