pbn32vpxk
/
tamguo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

Browse Source
main
tamguo 7 years ago
parent 05b4399b3c
commit a518801014
6 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File

3
tamguo-tms/src/main/java/com/tamguo/web/tiku/BookController.java
Unescape View File

@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.mapper.Condition; 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.BookEntity;
import com.tamguo.modules.tiku.model.ChapterEntity; import com.tamguo.modules.tiku.model.ChapterEntity;
import com.tamguo.modules.tiku.model.CourseEntity; import com.tamguo.modules.tiku.model.CourseEntity;
@ -42,7 +43,7 @@ public class BookController {
public ModelAndView index(@PathVariable String uid , ModelAndView model , HttpServletRequest request) { public ModelAndView index(@PathVariable String uid , ModelAndView model , HttpServletRequest request) {
try { try {
// request url // request url
logger.info("request url :{}" , request.getRequestURI()); logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() );
BookEntity book = iBookService.selectById(uid); BookEntity book = iBookService.selectById(uid);
SubjectEntity subject = iSubjectService.selectById(book.getSubjectId()); SubjectEntity subject = iSubjectService.selectById(book.getSubjectId());
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subject.getId()).orderAsc(Arrays.asList("sort"))); List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subject.getId()).orderAsc(Arrays.asList("sort")));

3
tamguo-tms/src/main/java/com/tamguo/web/tiku/CourseController.java
Unescape View File

@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.mapper.Condition; 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.BookEntity;
import com.tamguo.modules.tiku.model.ChapterEntity; import com.tamguo.modules.tiku.model.ChapterEntity;
import com.tamguo.modules.tiku.model.CourseEntity; import com.tamguo.modules.tiku.model.CourseEntity;
@ -48,7 +49,7 @@ public class CourseController {
public ModelAndView index(HttpServletRequest request , @PathVariable String uid , ModelAndView model) { public ModelAndView index(HttpServletRequest request , @PathVariable String uid , ModelAndView model) {
try { try {
// request url // request url
logger.info("request url :{}" , request.getRequestURI()); logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() );
CourseEntity course = iCourseService.selectById(uid); CourseEntity course = iCourseService.selectById(uid);
List<BookEntity> bookList = iBookService.selectList(Condition.create().eq("course_id", uid)); List<BookEntity> bookList = iBookService.selectList(Condition.create().eq("course_id", uid));
List<ChapterEntity> chapterList = null; List<ChapterEntity> chapterList = null;

6
tamguo-tms/src/main/java/com/tamguo/web/tiku/IndexController.java
Unescape View File

@ -9,6 +9,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.tamguo.common.utils.DateUtil;
@Controller @Controller
public class IndexController { public class IndexController {
@ -17,7 +19,7 @@ public class IndexController {
@RequestMapping(value = "/", method = RequestMethod.GET) @RequestMapping(value = "/", method = RequestMethod.GET)
public ModelAndView indexAction(ModelAndView model , HttpServletRequest request) { public ModelAndView indexAction(ModelAndView model , HttpServletRequest request) {
// request url // request url
logger.info("request url :{}" , request.getRequestURI()); logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() );
model.setViewName("index"); model.setViewName("index");
return model; return model;
} }
@ -25,7 +27,7 @@ public class IndexController {
@RequestMapping(value = "/index", method = RequestMethod.GET) @RequestMapping(value = "/index", method = RequestMethod.GET)
public ModelAndView mainAction(ModelAndView model , HttpServletRequest request) { public ModelAndView mainAction(ModelAndView model , HttpServletRequest request) {
// request url // request url
logger.info("request url :{}" , request.getRequestURI()); logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() );
model.setViewName("index"); model.setViewName("index");
return model; return model;
} }

5
tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java
Unescape View File

@ -16,6 +16,7 @@ import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.tamguo.common.utils.DateUtil;
import com.tamguo.common.utils.SystemConstant; import com.tamguo.common.utils.SystemConstant;
import com.tamguo.modules.sys.model.SysAreaEntity; import com.tamguo.modules.sys.model.SysAreaEntity;
import com.tamguo.modules.sys.service.ISysAreaService; import com.tamguo.modules.sys.service.ISysAreaService;
@ -57,7 +58,7 @@ public class PaperController {
@PathVariable String year , @PathVariable String area , @PathVariable Integer pageNum, ModelAndView model) { @PathVariable String year , @PathVariable String area , @PathVariable Integer pageNum, ModelAndView model) {
try { try {
// request url // request url
logger.info("request url :{}" , request.getRequestURI()); logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() );
CourseEntity course = iCourseService.selectById(courseId); CourseEntity course = iCourseService.selectById(courseId);
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId)); List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId));
SubjectEntity subject = iSubjectService.selectById(subjectId); SubjectEntity subject = iSubjectService.selectById(subjectId);
@ -112,7 +113,7 @@ public class PaperController {
public ModelAndView indexAction(HttpServletRequest request , @PathVariable String paperId , ModelAndView model){ public ModelAndView indexAction(HttpServletRequest request , @PathVariable String paperId , ModelAndView model){
try { try {
// request url // request url
logger.info("request url :{}" , request.getRequestURI()); logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() );
model.setViewName("paper"); model.setViewName("paper");
PaperEntity paper = iPaperService.selectById(paperId); PaperEntity paper = iPaperService.selectById(paperId);
model.addObject("paper", paper); model.addObject("paper", paper);

7
tamguo-tms/src/main/java/com/tamguo/web/tiku/QuestionContrller.java
Unescape View File

@ -16,6 +16,7 @@ import org.springframework.web.servlet.ModelAndView;
import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.tamguo.common.utils.DateUtil;
import com.tamguo.common.utils.Result; import com.tamguo.common.utils.Result;
import com.tamguo.modules.tiku.model.ChapterEntity; import com.tamguo.modules.tiku.model.ChapterEntity;
import com.tamguo.modules.tiku.model.CourseEntity; import com.tamguo.modules.tiku.model.CourseEntity;
@ -46,7 +47,7 @@ public class QuestionContrller {
@PathVariable Integer size , ModelAndView model , HttpServletRequest request){ @PathVariable Integer size , ModelAndView model , HttpServletRequest request){
try { try {
// request url // request url
logger.info("request url :{}" , request.getRequestURI()); logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() );
model.setViewName("questionList"); model.setViewName("questionList");
ChapterEntity chapter = iChapterService.selectById(chapterId); ChapterEntity chapter = iChapterService.selectById(chapterId);
@ -83,8 +84,10 @@ public class QuestionContrller {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@RequestMapping(value = {"/question/{uid}.html"}, method = RequestMethod.GET) @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 { try {
// request url
logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() );
model.setViewName("question"); model.setViewName("question");
QuestionEntity question = iQuestionService.selectById(uid); QuestionEntity question = iQuestionService.selectById(uid);
question.setQuestionType(question.getQuestionType()); question.setQuestionType(question.getQuestionType());

3
tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java
Unescape View File

@ -17,6 +17,7 @@ import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.mapper.Condition;
import com.tamguo.common.utils.DateUtil;
import com.tamguo.common.utils.Result; import com.tamguo.common.utils.Result;
import com.tamguo.modules.sys.service.ISysAreaService; import com.tamguo.modules.sys.service.ISysAreaService;
import com.tamguo.modules.tiku.model.BookEntity; import com.tamguo.modules.tiku.model.BookEntity;
@ -56,7 +57,7 @@ public class SubjectController {
public ModelAndView indexAction(@PathVariable String subjectId , HttpServletRequest request , ModelAndView model) { public ModelAndView indexAction(@PathVariable String subjectId , HttpServletRequest request , ModelAndView model) {
try { try {
// request url // request url
logger.info("request url :{}" , request.getRequestURI()); logger.info("request url :{} , time:{} " , request.getRequestURI() , DateUtil.getCurrentDateYYYYMMDDStr() );
SubjectEntity subject = iSubjectService.selectById(subjectId); SubjectEntity subject = iSubjectService.selectById(subjectId);
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId).orderAsc(Arrays.asList("sort"))); List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId).orderAsc(Arrays.asList("sort")));
// 获取第一个科目 // 获取第一个科目

Write Preview
Loading…
Cancel
Save