Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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

@@ -1,8 +1,14 @@
 package com.ibeetl.jlw.entity;
 
 import cn.jlw.validate.ValidateConfig;
+import com.fasterxml.jackson.annotation.JsonAnyGetter;
 import com.ibeetl.admin.core.entity.BaseEntity;
+import com.ibeetl.admin.core.entity.CoreUser;
 import org.beetl.sql.annotation.entity.AutoID;
+import org.beetl.sql.annotation.entity.InsertIgnore;
+import org.beetl.sql.annotation.entity.UpdateIgnore;
+import org.beetl.sql.fetch.annotation.Fetch;
+import org.beetl.sql.fetch.annotation.FetchOne;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -11,6 +17,7 @@ import java.util.Date;
 * 用户行为日志
 * gen by Spring Boot2 Admin 2019-08-16
 */
+@Fetch
 public class SysLog extends BaseEntity{
 
     //主键
@@ -66,6 +73,12 @@ public class SysLog extends BaseEntity{
     //管理员或老师ID
 
     private Long userId ;
+
+    @FetchOne("userId")
+    @JsonAnyGetter
+    @UpdateIgnore
+    @InsertIgnore
+    public CoreUser coreUser;
 	
     public SysLog(){
     }

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

@@ -223,10 +223,10 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
         teacherOpenCourseHandsOnSimulationTasksQuery.setTaskId(taskId);
         List<TeacherOpenCourseHandsOnSimulationTasks> list = teacherOpenCourseHandsOnSimulationTasksDao.getValuesByQuery(teacherOpenCourseHandsOnSimulationTasksQuery);
         if(null != list && list.size()>0){
-            for (TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks : list) {
-                List<HandsOnTaskProblemVO> objectiveProblem = getObjectiveProblem(teacherOpenCourseHandsOnSimulationTasks.getTaskList(), teacherOpenCourseHandsOnSimulationTasks.getTaskId());
-                teacherOpenCourseHandsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem);
-            }
+//            for (TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks : list) {
+//                List<HandsOnTaskProblemVO> objectiveProblem = getObjectiveProblem(teacherOpenCourseHandsOnSimulationTasks.getTaskList(), teacherOpenCourseHandsOnSimulationTasks.getTaskId());
+//                teacherOpenCourseHandsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem);
+//            }
             return list.get(0);
         }else{
             return null;
@@ -264,7 +264,7 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ
     public List<HandsOnTaskProblemVO> getObjectiveProblem(String problemIds, Long taskId) {
 //        List<ResourcesQuestion> resourcesQuestions = resourcesQuestionService.getByIds(problemIds);
         TeacherOpenCourseHandsOnSimulationTasks info = taskId == null ? null : getInfo(taskId);
-        List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = mergeResourcesQuestionService.getByIds(problemIds);
+        List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = StringUtils.isNotEmpty(problemIds) ? mergeResourcesQuestionService.getByIds(problemIds) : null;
         Map<Integer, List<TeacherOpenCourseMergeResourcesQuestion>> questions = resourcesQuestions.stream().collect(Collectors.groupingBy(TeacherOpenCourseMergeResourcesQuestion::getQuestionType));
         List<HandsOnTaskProblemVO> list = new ArrayList<>();
         questions.forEach((k,v) -> {

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

@@ -0,0 +1,102 @@
+//package com.ibeetl.jlw.web;
+//
+//import cn.jlw.Interceptor.SCoreUser;
+//import cn.jlw.validate.ValidateConfig;
+//import com.ibeetl.admin.core.annotation.Function;
+//import com.ibeetl.admin.core.entity.CoreUser;
+//import com.ibeetl.admin.core.file.FileService;
+//import com.ibeetl.admin.core.web.JsonResult;
+//import com.ibeetl.jlw.entity.SchoolClass;
+//import com.ibeetl.jlw.entity.SysLog;
+//import com.ibeetl.jlw.entity.Teacher;
+//import com.ibeetl.jlw.entity.TeacherOpenCourseNotice;
+//import com.ibeetl.jlw.service.SysLogService;
+//import com.ibeetl.jlw.service.TeacherService;
+//import com.ibeetl.jlw.web.query.TeacherOpenCourseNoticeQuery;
+//import org.apache.commons.lang3.StringUtils;
+//import org.apache.commons.logging.Log;
+//import org.apache.commons.logging.LogFactory;
+//import org.beetl.sql.core.engine.PageQuery;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.validation.BindingResult;
+//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.ResponseBody;
+//import org.springframework.web.bind.annotation.RestController;
+//import org.springframework.web.servlet.ModelAndView;
+//
+//import java.util.Date;
+//import java.util.List;
+//
+///**
+// * 系统日志 接口
+// * 切记不要对非线程安全的静态变量进行写操作
+// */
+//
+//@RestController
+//@Validated
+//public class SysLogController {
+//
+//    private final Log log = LogFactory.getLog(this.getClass());
+//    private static final String MODEL = "/jlw/sysLog";
+//    private static final String API = "/api/sysLog";
+//
+//
+//    @Autowired private SysLogService sysLogService;
+//
+//    @Autowired FileService fileService;
+//
+//    /* 前端接口 */
+//
+//    @PostMapping(API + "/getPageList.do")
+//    public JsonResult<PageQuery> getPageList(TeacherOpenCourseNoticeQuery condition,@SCoreUser CoreUser coreUser){
+//        if(null == coreUser){
+//            return JsonResult.failMessage("请登录后再操作");
+//        }else{
+//            PageQuery page = condition.getPageQuery();
+//            sysLogService.queryByConditionQuery(page);
+//            return JsonResult.success(page);
+//        }
+//    }
+//
+//
+//    @GetMapping(API + "/getList.do")
+//    public JsonResult<List<TeacherOpenCourseNotice>>getList(TeacherOpenCourseNoticeQuery param,@SCoreUser CoreUser coreUser) {
+//        if(null == coreUser){
+//            return JsonResult.failMessage("请登录后再操作");
+//        }else{
+//            List<TeacherOpenCourseNotice>list = sysLogService.getValuesByQuery(param);
+//            return  JsonResult.success(list);
+//        }
+//    }
+//
+//
+//    /* 后台页面 */
+//
+//    @GetMapping(MODEL + "/index.do")
+//    @Function("sysLog.query")
+//    public ModelAndView index() {
+//        ModelAndView view = new ModelAndView("/jlw/sysLog/index.html") ;
+//        view.addObject("search", TeacherOpenCourseNoticeQuery.class.getName());
+//        return view;
+//    }
+//
+//    /* 后台接口 */
+//
+//    @PostMapping(MODEL + "/list.json")
+//    @Function("sysLog.query")
+//    public JsonResult<PageQuery> list(TeacherOpenCourseNoticeQuery condition){
+//        PageQuery page = condition.getPageQuery();
+//        sysLogService.queryByCondition(page);
+//        return JsonResult.success(page);
+//    }
+//
+//    @GetMapping(MODEL + "/getValues.json")
+//    @Function("sysLog.query")
+//    public JsonResult<List<TeacherOpenCourseNotice>>getValues(TeacherOpenCourseNoticeQuery param) {
+//        List<TeacherOpenCourseNotice>list = sysLogService.getValuesByQuery(param);
+//        return  JsonResult.success(list);
+//    }
+//
+//}

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

@@ -12,6 +12,8 @@ import com.ibeetl.jlw.entity.TeacherOpenCourseScheduleSessionOptions;
 import com.ibeetl.jlw.service.TeacherOpenCourseScheduleSessionClassService;
 import com.ibeetl.jlw.service.TeacherOpenCourseScheduleSessionService;
 import com.ibeetl.jlw.service.TeacherOpenCourseScheduleSessionTagService;
+import com.ibeetl.jlw.service.TeacherOpenCourseService;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionClassQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionQuery;
 import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionTagQuery;
@@ -47,6 +49,7 @@ public class TeacherOpenCourseScheduleSessionController{
     @Autowired private TeacherOpenCourseScheduleSessionService teacherOpenCourseScheduleSessionService;
     @Autowired private TeacherOpenCourseScheduleSessionTagService teacherOpenCourseScheduleSessionTagService;
     @Autowired private TeacherOpenCourseScheduleSessionClassService teacherOpenCourseScheduleSessionClassService;
+    @Autowired private TeacherOpenCourseService teacherOpenCourseService;
 
     @Autowired
     FileService fileService;
@@ -116,6 +119,11 @@ public class TeacherOpenCourseScheduleSessionController{
     @ResponseBody
     public ModelAndView add(Long teacherOpenCourseScheduleSessionId) {
         ModelAndView view = new ModelAndView("/jlw/teacherOpenCourseScheduleSession/add.html");
+
+        // 教师开课列表
+        TeacherOpenCourseQuery tocParams = new TeacherOpenCourseQuery();
+        tocParams.setTeacherOpenCourseStatus(1);
+        view.addObject("teacherOpenCourseList", teacherOpenCourseService.getValuesByQuery(tocParams));
         // 公共查询
         // 课次标签列表
         TeacherOpenCourseScheduleSessionTagQuery param = new TeacherOpenCourseScheduleSessionTagQuery();

web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md

@@ -278,6 +278,8 @@ deleteByIds
 getByIds
 ===
 select * from teacher_open_course_schedule_session where find_in_set(teacher_open_course_schedule_session_id,#ids#)
+
+
 updateGivenByIds
 ===
 * 批量更新指定字段，无论此字段是否有值