增加一些接口

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreBaseAnnotationParser.java

@@ -38,10 +38,20 @@ public class CoreBaseAnnotationParser {
     @Resource
     protected CoreDictService dictUtil;
 
+    /**
+     * 渲染自定义注解（列表）
+     *
+     * @param list
+     */
     public void queryListAfter(List list) {
         list.parallelStream().forEach(this::queryEntityAfter);
     }
 
+    /**
+     * 渲染自定义注解（单体）
+     *
+     * @param bean
+     */
     public void queryEntityAfter(Object bean) {
         if (bean == null) {
             return;

data_base_design/天泽数据大平台.pdb

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1666237010" Name="cjks" Objects="1108" Symbols="88" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
+<?PowerDesigner AppLocale="UTF16" ID="{BA33ABB7-B246-4DB0-85DE-396EDDB46458}" Label="" LastModificationDate="1666427999" Name="cjks" Objects="1121" Symbols="88" Target="MySQL 5.0" Type="{CDE44E21-9669-11D1-9914-006097355D9B}" signature="PDM_DATA_MODEL_XML" version="16.5.0.3982"?>
 <!-- do not edit this file -->
 
 <Model xmlns:a="attribute" xmlns:c="collection" xmlns:o="object">
@@ -5834,7 +5834,7 @@ LABL 0 新宋体,8,N</a:FontList>
 <a:CreationDate>1661960474</a:CreationDate>
 <a:ModificationDate>1666098792</a:ModificationDate>
 <a:IconMode>-1</a:IconMode>
-<a:Rect>((288838,34908), (327566,49304))</a:Rect>
+<a:Rect>((288838,34907), (327566,49305))</a:Rect>
 <a:LineColor>12615680</a:LineColor>
 <a:FillColor>16570034</a:FillColor>
 <a:ShadowColor>12632256</a:ShadowColor>
@@ -14205,8 +14205,8 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Code>teacher_open_course_student_signin_setting</a:Code>
 <a:CreationDate>1661850632</a:CreationDate>
 <a:Creator>lx</a:Creator>
-<a:ModificationDate>1665721090</a:ModificationDate>
+<a:ModificationDate>1666427999</a:ModificationDate>
-<a:Modifier>87966</a:Modifier>
+<a:Modifier>lx</a:Modifier>
 <a:Comment>教师-我的课程-开课-学生签到-配置</a:Comment>
 <a:PhysicalOptions>auto_increment = 1
 ENGINE = InnoDB
@@ -14312,9 +14312,11 @@ COLLATE = utf8_general_ci</a:PhysicalOptions>
 <a:Code>teacher_open_course_student_signin_setting_start_status</a:Code>
 <a:CreationDate>1665627857</a:CreationDate>
 <a:Creator>87966</a:Creator>
-<a:ModificationDate>1665632316</a:ModificationDate>
+<a:ModificationDate>1666427950</a:ModificationDate>
-<a:Modifier>87966</a:Modifier>
+<a:Modifier>lx</a:Modifier>
 <a:Comment>开启状态 （枚举 StartStatusEnum）</a:Comment>
+<a:DataType>varchar(50)</a:DataType>
+<a:Length>50</a:Length>
 </o:Column>
 <o:Column Id="o768">
 <a:ObjectID>76B272D0-603F-4BD1-9969-CAB274D4A79B</a:ObjectID>

web/src/main/java/com/ibeetl/jlw/entity/Student.java

@@ -2,6 +2,7 @@ package com.ibeetl.jlw.entity;
 
 import cn.jlw.validate.ValidateConfig;
 import com.ibeetl.admin.core.annotation.Dict;
+import com.ibeetl.admin.core.annotation.DictDeep;
 import com.ibeetl.admin.core.entity.BaseEntity;
 import com.ibeetl.admin.core.enums.MenuEnums;
 import org.beetl.sql.annotation.entity.AutoID;
@@ -75,6 +76,7 @@ public class Student extends BaseEntity implements TokenInterface {
     private Long userId ;
 
     @FetchOne("classId")
+    @DictDeep
     private SchoolClass schoolClass;
 	
     public Student(){

web/src/main/java/com/ibeetl/jlw/entity/TeacherOpenCourseQuestionSetting.java

@@ -77,6 +77,10 @@ public class TeacherOpenCourseQuestionSetting extends BaseEntity {
     @DictEnum
     private ResourcesQuestionSnapshotFromTypeEnum teacherOpenCourseQuestionSettingType ;
 
+    // 题目要求（附件类型题目，需要）
+
+    private String teacherOpenCourseQuestionSettingRequire ;
+
     //附件，老师上传附件（单文件）
 
     private String teacherOpenCourseQuestionSettingFile ;

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java

@@ -1,6 +1,7 @@
 package com.ibeetl.jlw.service;
 
 import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
 import cn.jlw.util.ToolUtils;
 import cn.jlw.validate.ValidateConfig;
 import com.alibaba.fastjson.JSON;
@@ -20,11 +21,13 @@ import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeStudentQuery;
 import org.apache.commons.lang3.StringUtils;
 import org.beetl.sql.core.SqlId;
 import org.beetl.sql.core.engine.PageQuery;
+import org.beetl.sql.core.query.LambdaQuery;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.ArrayList;
@@ -208,4 +211,28 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
 
         return JsonResult.success();
     }
+
+    /**
+     * 教师端-随机抽取开课下的学生数
+     * 随机题目
+     * @param teacherOpenCourseId   开课ID
+     * @param randomCount           随机数量 如果为空，则查询所有
+     * @return
+     */
+    public List<TeacherOpenCourseMergeStudent> randomStudentList(
+            @NotNull(message = "开课ID不能为空！") Long teacherOpenCourseId,
+            @Min(message = "随机抽取的数量不能小于1（非必填）！", value = 1) Long randomCount) {
+
+        LambdaQuery<TeacherOpenCourseMergeStudent> lambdaQuery = teacherOpenCourseMergeStudentDao.createLambdaQuery()
+                .andEq(TeacherOpenCourseMergeStudent::getTeacherOpenCourseId, teacherOpenCourseId);
+
+        // 查询数量大于0
+        if(ObjectUtil.isNotNull(randomCount)) {
+            lambdaQuery.appendSql("ORDER BY RAND() LIMIT  " + randomCount);
+        }
+
+        List<TeacherOpenCourseMergeStudent> studentList = lambdaQuery.select();
+        queryListAfter(studentList);
+        return studentList;
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/StatisticalAnalysisController.java

@@ -17,7 +17,7 @@ import java.util.Map;
  * @Date 2022/10/6 11:08
  */
 @RestController
-@RequestMapping("/jlw/statisticalAnalysis")
+@RequestMapping("/api/statisticalAnalysis")
 public class StatisticalAnalysisController {
 
     @Autowired
@@ -28,7 +28,7 @@ public class StatisticalAnalysisController {
      * @param map
      * @return
      */
-    @RequestMapping("/detail")
+    @RequestMapping("/detail.do")
     public JsonResult<Object> detail(@RequestBody Map<String, Object> map) {
         Map<String, Object> detail = statisticalAnalysisService.detail(map);
         return JsonResult.success(detail);
@@ -40,7 +40,7 @@ public class StatisticalAnalysisController {
      * @param map
      * @return
      */
-    @RequestMapping("/indexDetail")
+    @RequestMapping("/indexDetail.do")
     public JsonResult<Object> indexDetail(@RequestBody Map<String, Object> map) {
         Map<String, Object> detail = statisticalAnalysisService.indexDetail(map);
         return JsonResult.success(detail);

web/src/main/java/com/ibeetl/jlw/web/TeacherController.java

@@ -1035,6 +1035,7 @@ public class TeacherController{
             teacher.setOrgId(null);
             boolean success = teacherService.edit(teacher);
             if (success) {
+
                 return JsonResult.success();
             } else {
                 return JsonResult.failMessage("更新失败");

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java

@@ -214,4 +214,17 @@ public class TeacherOpenCourseMergeStudentController{
         }
     }
 
+    /**
+     * 教师端-随机抽取开课下的学生数
+     *
+     * @param teacherOpenCourseId   开课ID
+     * @param randomCount           随机数量    null或者-1 则查询所有开课关联的学生
+     * @return
+     */
+    @PostMapping(MODEL + "/randomStudentList.json")
+    @Function("teacherOpenCourseMergeStudent.query")
+    public JsonResult randomStudentList(Long teacherOpenCourseId, Long randomCount) {
+        return JsonResult.success(teacherOpenCourseMergeStudentService.randomStudentList(teacherOpenCourseId, randomCount));
+    }
+
 }

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseStudentSigninSettingController.java

@@ -143,6 +143,15 @@ public class TeacherOpenCourseStudentSigninSettingController{
         }
     }
 
+    /**
+     * 教师端-发起签到（统一签到接口，根据类型验证）
+     *
+     * 会根据传入的teacherOpenCourseStudentSigninSettingType字段，进行动态验证属性。
+     * @param teacherOpenCourseStudentSigninSettingQuery
+     * @param result
+     * @param coreUser
+     * @return
+     */
     @PostMapping(MODEL + "/add.json")
     @Function("teacherOpenCourseStudentSigninSetting.add")
     public JsonResult add(@Validated(ValidateConfig.ADD.class) TeacherOpenCourseStudentSigninSettingQuery teacherOpenCourseStudentSigninSettingQuery, BindingResult result,@SCoreUser CoreUser coreUser){