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); +// } +// +//}