From a51880101433a4a9e4b32f86e1db1455a9b229d3 Mon Sep 17 00:00:00 2001 From: tamguo Date: Wed, 15 Aug 2018 15:14:51 +0800 Subject: [PATCH] fix bug --- .../main/java/com/tamguo/web/tiku/BookController.java | 3 ++- .../java/com/tamguo/web/tiku/CourseController.java | 5 +++-- .../main/java/com/tamguo/web/tiku/IndexController.java | 10 ++++++---- .../main/java/com/tamguo/web/tiku/PaperController.java | 9 +++++---- .../java/com/tamguo/web/tiku/QuestionContrller.java | 7 +++++-- .../java/com/tamguo/web/tiku/SubjectController.java | 3 ++- 6 files changed, 23 insertions(+), 14 deletions(-) diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/BookController.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/BookController.java index 0234dd5..472b5b4 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/BookController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/BookController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; import com.baomidou.mybatisplus.mapper.Condition; +import com.tamguo.common.utils.DateUtil; import com.tamguo.modules.tiku.model.BookEntity; import com.tamguo.modules.tiku.model.ChapterEntity; import com.tamguo.modules.tiku.model.CourseEntity; @@ -42,7 +43,7 @@ public class BookController { public ModelAndView index(@PathVariable String uid , ModelAndView model , HttpServletRequest request) { try { // request url - logger.info("request url :{}" , request.getRequestURI()); + logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() ); BookEntity book = iBookService.selectById(uid); SubjectEntity subject = iSubjectService.selectById(book.getSubjectId()); List courseList = iCourseService.selectList(Condition.create().eq("subject_id", subject.getId()).orderAsc(Arrays.asList("sort"))); diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/CourseController.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/CourseController.java index a1c6b54..d0d53ab 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/CourseController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/CourseController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; import com.baomidou.mybatisplus.mapper.Condition; +import com.tamguo.common.utils.DateUtil; import com.tamguo.modules.tiku.model.BookEntity; import com.tamguo.modules.tiku.model.ChapterEntity; import com.tamguo.modules.tiku.model.CourseEntity; @@ -47,8 +48,8 @@ public class CourseController { @RequestMapping(value = {"course/{uid}.html"}, method = RequestMethod.GET) public ModelAndView index(HttpServletRequest request , @PathVariable String uid , ModelAndView model) { try { - // request url - logger.info("request url :{}" , request.getRequestURI()); + // request url + logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() ); CourseEntity course = iCourseService.selectById(uid); List bookList = iBookService.selectList(Condition.create().eq("course_id", uid)); List chapterList = null; diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/IndexController.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/IndexController.java index 3698b65..557e04a 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/IndexController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/IndexController.java @@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; +import com.tamguo.common.utils.DateUtil; + @Controller public class IndexController { @@ -16,16 +18,16 @@ public class IndexController { @RequestMapping(value = "/", method = RequestMethod.GET) public ModelAndView indexAction(ModelAndView model , HttpServletRequest request) { - // request url - logger.info("request url :{}" , request.getRequestURI()); + // request url + logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() ); model.setViewName("index"); return model; } @RequestMapping(value = "/index", method = RequestMethod.GET) public ModelAndView mainAction(ModelAndView model , HttpServletRequest request) { - // request url - logger.info("request url :{}" , request.getRequestURI()); + // request url + logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() ); model.setViewName("index"); return model; } diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java index ef8d0c9..0475c2d 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java @@ -16,6 +16,7 @@ import org.springframework.web.servlet.ModelAndView; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; +import com.tamguo.common.utils.DateUtil; import com.tamguo.common.utils.SystemConstant; import com.tamguo.modules.sys.model.SysAreaEntity; import com.tamguo.modules.sys.service.ISysAreaService; @@ -56,8 +57,8 @@ public class PaperController { public ModelAndView indexAction(HttpServletRequest request , @PathVariable String subjectId , @PathVariable String courseId , @PathVariable String paperType, @PathVariable String year , @PathVariable String area , @PathVariable Integer pageNum, ModelAndView model) { try { - // request url - logger.info("request url :{}" , request.getRequestURI()); + // request url + logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() ); CourseEntity course = iCourseService.selectById(courseId); List courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId)); SubjectEntity subject = iSubjectService.selectById(subjectId); @@ -111,8 +112,8 @@ public class PaperController { @RequestMapping(value = {"/paper/{paperId}.html"}, method = RequestMethod.GET) public ModelAndView indexAction(HttpServletRequest request , @PathVariable String paperId , ModelAndView model){ try { - // request url - logger.info("request url :{}" , request.getRequestURI()); + // request url + logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() ); model.setViewName("paper"); PaperEntity paper = iPaperService.selectById(paperId); model.addObject("paper", paper); diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java index c9c298c..f208406 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java @@ -16,6 +16,7 @@ import org.springframework.web.servlet.ModelAndView; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; +import com.tamguo.common.utils.DateUtil; import com.tamguo.common.utils.Result; import com.tamguo.modules.tiku.model.ChapterEntity; import com.tamguo.modules.tiku.model.CourseEntity; @@ -46,7 +47,7 @@ public class QuestionContrller { @PathVariable Integer size , ModelAndView model , HttpServletRequest request){ try { // request url - logger.info("request url :{}" , request.getRequestURI()); + logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() ); model.setViewName("questionList"); ChapterEntity chapter = iChapterService.selectById(chapterId); @@ -83,8 +84,10 @@ public class QuestionContrller { */ @SuppressWarnings("unchecked") @RequestMapping(value = {"/question/{uid}.html"}, method = RequestMethod.GET) - public ModelAndView question(@PathVariable String uid , ModelAndView model){ + public ModelAndView question(@PathVariable String uid , ModelAndView model , HttpServletRequest request){ try { + // request url + logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() ); model.setViewName("question"); QuestionEntity question = iQuestionService.selectById(uid); question.setQuestionType(question.getQuestionType()); diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java index 925cbda..32bb33f 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java @@ -17,6 +17,7 @@ import org.springframework.web.servlet.ModelAndView; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.mapper.Condition; +import com.tamguo.common.utils.DateUtil; import com.tamguo.common.utils.Result; import com.tamguo.modules.sys.service.ISysAreaService; import com.tamguo.modules.tiku.model.BookEntity; @@ -56,7 +57,7 @@ public class SubjectController { public ModelAndView indexAction(@PathVariable String subjectId , HttpServletRequest request , ModelAndView model) { try { // request url - logger.info("request url :{}" , request.getRequestURI()); + logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() ); SubjectEntity subject = iSubjectService.selectById(subjectId); List courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId).orderAsc(Arrays.asList("sort"))); // 获取第一个科目