From 18273322d6bbcf4e4f8ef6f59796a56ba49415a9 Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Thu, 10 Nov 2022 17:34:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9C=AA=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ibeetl/jlw/entity/SysLog.java | 13 +++ .../com/ibeetl/jlw/web/SysLogController.java | 102 ++++++++++++++++++ 2 files changed, 115 insertions(+) create mode 100644 web/src/main/java/com/ibeetl/jlw/web/SysLogController.java diff --git a/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java b/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java index 220d9341..39a94fdb 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/SysLog.java +++ b/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(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/web/SysLogController.java b/web/src/main/java/com/ibeetl/jlw/web/SysLogController.java new file mode 100644 index 00000000..06cc5d59 --- /dev/null +++ b/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 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>getList(TeacherOpenCourseNoticeQuery param,@SCoreUser CoreUser coreUser) { +// if(null == coreUser){ +// return JsonResult.failMessage("请登录后再操作"); +// }else{ +// Listlist = 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 list(TeacherOpenCourseNoticeQuery condition){ +// PageQuery page = condition.getPageQuery(); +// sysLogService.queryByCondition(page); +// return JsonResult.success(page); +// } +// +// @GetMapping(MODEL + "/getValues.json") +// @Function("sysLog.query") +// public JsonResult>getValues(TeacherOpenCourseNoticeQuery param) { +// Listlist = sysLogService.getValuesByQuery(param); +// return JsonResult.success(list); +// } +// +//} From f765b4111899867324864e2abaf6ecc29f2df761 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Fri, 11 Nov 2022 12:45:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...TeacherOpenCourseHandsOnSimulationTasksService.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java index c55e6f3b..26218254 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseHandsOnSimulationTasksService.java @@ -223,10 +223,10 @@ public class TeacherOpenCourseHandsOnSimulationTasksService extends CoreBaseServ teacherOpenCourseHandsOnSimulationTasksQuery.setTaskId(taskId); List list = teacherOpenCourseHandsOnSimulationTasksDao.getValuesByQuery(teacherOpenCourseHandsOnSimulationTasksQuery); if(null != list && list.size()>0){ - for (TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks : list) { - List objectiveProblem = getObjectiveProblem(teacherOpenCourseHandsOnSimulationTasks.getTaskList(), teacherOpenCourseHandsOnSimulationTasks.getTaskId()); - teacherOpenCourseHandsOnSimulationTasks.setHandsOnTaskProblemVo(objectiveProblem); - } +// for (TeacherOpenCourseHandsOnSimulationTasks teacherOpenCourseHandsOnSimulationTasks : list) { +// List 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 getObjectiveProblem(String problemIds, Long taskId) { // List resourcesQuestions = resourcesQuestionService.getByIds(problemIds); TeacherOpenCourseHandsOnSimulationTasks info = taskId == null ? null : getInfo(taskId); - List resourcesQuestions = mergeResourcesQuestionService.getByIds(problemIds); + List resourcesQuestions = StringUtils.isNotEmpty(problemIds) ? mergeResourcesQuestionService.getByIds(problemIds) : null; Map> questions = resourcesQuestions.stream().collect(Collectors.groupingBy(TeacherOpenCourseMergeResourcesQuestion::getQuestionType)); List list = new ArrayList<>(); questions.forEach((k,v) -> { From 7bfcfbe49374e2796c599c42d0da5c595b0d778a Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Fri, 11 Nov 2022 14:20:18 +0800 Subject: [PATCH 3/4] 1 --- .../web/TeacherOpenCourseScheduleSessionController.java | 8 ++++++++ .../resources/sql/jlw/teacherOpenCourseScheduleSession.md | 2 ++ 2 files changed, 10 insertions(+) diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java index a63576be..53e7a5da 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java +++ b/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(); diff --git a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md b/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md index 3a276bc0..0ad8f992 100644 --- a/web/src/main/resources/sql/jlw/teacherOpenCourseScheduleSession.md +++ b/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 === * 批量更新指定字段，无论此字段是否有值 From 92161056d65facbe31df5d42f33595fe4c5dc19b Mon Sep 17 00:00:00 2001 From: Mlxa0324 Date: Fri, 11 Nov 2022 14:20:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=95=99=E5=B8=88=E5=BC=80=E8=AF=BE?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/web/TeacherOpenCourseScheduleSessionController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java index 53e7a5da..98849aff 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseScheduleSessionController.java @@ -120,7 +120,7 @@ public class TeacherOpenCourseScheduleSessionController{ 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));