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

删掉异常处理。

Browse Source
main
tamguo 7 years ago
parent b183266074
commit ef26f5a7da
7 changed files with 141 additions and 175 deletions
Show Stats Download Patch File Download Diff File

9
tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java
Unescape View File

@ -32,13 +32,14 @@ public class PaperCrawler {
private final String COURSE_ID = "likeshuxue";
// 110000 北京 | 310000 上海 | 500000 重庆 | 120100 天津 | 370000 山东 | 410000 河南 | 420000 湖北 | 320000 江苏 | 330000 浙江
// 140000 山西 | 350000 福建 | 340000 安徽 | 220000 吉林 | 150000 内蒙古 | 640000 宁夏 | 650000 新疆 | 广西 450000 | 210000 辽宁
private final String AREA_ID = "210000";
// 230000 黑龙江
private final String AREA_ID = "230000";
// 年份
private final String YEAR = "2015";
private final String YEAR = "2016";
// 真题试卷 类型(1:真题试卷,2:模拟试卷,3:押题预测,4:名校精品)
private final String PAPER_TYPE = "3";
private final String PAPER_TYPE = "4";
// 开始采集的URL
private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-16-2-2015-1180-1-download";
private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-16-7-2016-1247-1-download";
private RunData runData;

2
tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java
Unescape View File

@ -61,7 +61,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, PaperEntity> impl
List<PaperEntity> paperList = (List<PaperEntity>) cacheService.getObject(SystemConstant.HOT_PAPER);
if(paperList == null){
Page<PaperEntity> page = new Page<>(1 , 10);
paperList = paperMapper.selectPage(page, Condition.create().eq("area_id", areaId).orderDesc(Arrays.asList("id")));
paperList = paperMapper.selectPage(page, Condition.create().orderDesc(Arrays.asList("id")));
cacheService.setObject(SystemConstant.HOT_PAPER, paperList , 2 * 60 * 60);
}
return paperList;

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

@ -40,27 +40,22 @@ public class BookController {
@SuppressWarnings("unchecked")
@RequestMapping(value = {"book/{uid}.html"}, method = RequestMethod.GET)
public ModelAndView index(@PathVariable String uid , ModelAndView model , HttpServletRequest request) {
try {
// request url
logger.info("request url :{} " , request.getRequestURI());
BookEntity book = iBookService.selectById(uid);
SubjectEntity subject = iSubjectService.selectById(book.getSubjectId());
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subject.getId()).orderAsc(Arrays.asList("sort")));
List<BookEntity> bookList = iBookService.selectList(Condition.create().eq("course_id", book.getCourseId()));
CourseEntity course = iCourseService.selectById(book.getCourseId());
List<ChapterEntity> chapterList = iChapterService.findChapterTree(book.getId());
model.addObject("book", book);
model.addObject("subject", subject);
model.addObject("course", course);
model.addObject("chapterList" , chapterList);
model.addObject("courseList", courseList);
model.addObject("bookList", bookList);
model.setViewName("book");
return model;
} catch (Exception e) {
model.setViewName("404");
return model;
}
// request url
logger.info("request url :{} " , request.getRequestURI());
BookEntity book = iBookService.selectById(uid);
SubjectEntity subject = iSubjectService.selectById(book.getSubjectId());
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subject.getId()).orderAsc(Arrays.asList("sort")));
List<BookEntity> bookList = iBookService.selectList(Condition.create().eq("course_id", book.getCourseId()));
CourseEntity course = iCourseService.selectById(book.getCourseId());
List<ChapterEntity> chapterList = iChapterService.findChapterTree(book.getId());
model.addObject("book", book);
model.addObject("subject", subject);
model.addObject("course", course);
model.addObject("chapterList" , chapterList);
model.addObject("courseList", courseList);
model.addObject("bookList", bookList);
model.setViewName("book");
return model;
}
}

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

@ -46,32 +46,27 @@ public class CourseController {
@SuppressWarnings("unchecked")
@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());
CourseEntity course = iCourseService.selectById(uid);
List<BookEntity> bookList = iBookService.selectList(Condition.create().eq("course_id", uid));
List<ChapterEntity> chapterList = null;
BookEntity book = null;
if(bookList.size() > 0) {
book = bookList.get(0);
chapterList = iChapterService.findChapterTree(book.getId());
}
SubjectEntity subject = iSubjectService.selectById(course.getSubjectId());
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", course.getSubjectId()).orderAsc(Arrays.asList("sort")));
model.addObject("chapterList", chapterList);
model.addObject("courseList", courseList);
model.addObject("course", course);
model.addObject("subject", subject);
model.addObject("bookList", bookList);
model.addObject("book" , book);
model.setViewName("chapter");
return model;
} catch (Exception e) {
model.setViewName("404");
return model;
// request url
logger.info("request url :{}" , request.getRequestURI());
CourseEntity course = iCourseService.selectById(uid);
List<BookEntity> bookList = iBookService.selectList(Condition.create().eq("course_id", uid));
List<ChapterEntity> chapterList = null;
BookEntity book = null;
if(bookList.size() > 0) {
book = bookList.get(0);
chapterList = iChapterService.findChapterTree(book.getId());
}
SubjectEntity subject = iSubjectService.selectById(course.getSubjectId());
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", course.getSubjectId()).orderAsc(Arrays.asList("sort")));
model.addObject("chapterList", chapterList);
model.addObject("courseList", courseList);
model.addObject("course", course);
model.addObject("subject", subject);
model.addObject("bookList", bookList);
model.addObject("book" , book);
model.setViewName("chapter");
return model;
}
@RequestMapping(value = {"course/findChapter.html"}, method = RequestMethod.GET)

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

@ -54,59 +54,53 @@ public class PaperController {
@RequestMapping(value = {"paperlist/{subjectId}-{courseId}-{paperType}-{year}-{area}-{pageNum}.html"}, method = RequestMethod.GET)
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());
CourseEntity course = iCourseService.selectById(courseId);
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId));
SubjectEntity subject = iSubjectService.selectById(subjectId);
List<SysAreaEntity> areaList = iSysAreaService.selectList(Condition.create().eq("tree_level", "0"));
Page<PaperEntity> page = new Page<>(pageNum , 10);
Condition condition = Condition.create();
if(!StringUtils.isEmpty(subjectId) && !"0".equals(subjectId)) {
condition.eq("subject_id", subjectId);
}
if(!StringUtils.isEmpty(paperType) && !"0".equals(paperType)) {
condition.eq("type", paperType);
}
if(!StringUtils.isEmpty(courseId) && !"0".equals(courseId)) {
condition.eq("course_id", courseId);
}
if(!StringUtils.isEmpty(year) && !"0".equals(year)) {
condition.eq("year", year);
}
if(!StringUtils.isEmpty(area) && !"0".equals(area)) {
condition.eq("area_id", area);
}
PageUtils result = PageUtils.getPage(iPaperService.selectPage(page , condition));
if(courseList.size() > 0) {
course = courseList.get(0);
}
Integer total = iPaperService.selectCount(Condition.EMPTY);
model.addObject("courseList", courseList);
model.addObject("subject", subject);
model.addObject("course", course);
model.addObject("areaList", areaList);
model.addObject("paperPage" , result);
model.addObject("total" , total);
model.addObject("courseId", courseId);
model.addObject("paperType", paperType);
model.addObject("year", year);
model.addObject("area", area);
// request url
logger.info("request url :{}" , request.getRequestURI());
CourseEntity course = iCourseService.selectById(courseId);
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId));
SubjectEntity subject = iSubjectService.selectById(subjectId);
List<SysAreaEntity> areaList = iSysAreaService.selectList(Condition.create().eq("tree_level", "0"));
Page<PaperEntity> page = new Page<>(pageNum , 10);
Condition condition = Condition.create();
if(!StringUtils.isEmpty(subjectId) && !"0".equals(subjectId)) {
condition.eq("subject_id", subjectId);
}
if(!StringUtils.isEmpty(paperType) && !"0".equals(paperType)) {
condition.eq("type", paperType);
}
if(!StringUtils.isEmpty(courseId) && !"0".equals(courseId)) {
condition.eq("course_id", courseId);
}
if(!StringUtils.isEmpty(year) && !"0".equals(year)) {
condition.eq("year", year);
}
if(!StringUtils.isEmpty(area) && !"0".equals(area)) {
condition.eq("area_id", area);
}
PageUtils result = PageUtils.getPage(iPaperService.selectPage(page , condition));
if(courseList.size() > 0) {
course = courseList.get(0);
}
Integer total = iPaperService.selectCount(Condition.EMPTY);
model.addObject("courseList", courseList);
model.addObject("subject", subject);
model.addObject("course", course);
model.addObject("areaList", areaList);
model.addObject("paperPage" , result);
model.addObject("total" , total);
model.addObject("courseId", courseId);
model.addObject("paperType", paperType);
model.addObject("year", year);
model.addObject("area", area);
if(BrowserUtils.isMobile(request.getHeader("user-agent"))) {
model.setViewName("mobile/paperlist");
}else {
model.setViewName("paperlist");
}
return model;
} catch (Exception e) {
model.setViewName("404");
return model;
}
if(BrowserUtils.isMobile(request.getHeader("user-agent"))) {
model.setViewName("mobile/paperlist");
}else {
model.setViewName("paperlist");
}
return model;
}
@SuppressWarnings("unchecked")

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

@ -46,35 +46,29 @@ public class QuestionContrller {
@RequestMapping(value = {"questionlist/{chapterId}-{current}-{size}.html"}, method = RequestMethod.GET)
public ModelAndView questionList(@PathVariable String chapterId , @PathVariable Integer current ,
@PathVariable Integer size , ModelAndView model , HttpServletRequest request){
try {
// request url
logger.info("request url :{} " , request.getRequestURI());
model.setViewName("questionList");
// request url
logger.info("request url :{} " , request.getRequestURI());
model.setViewName("questionList");
ChapterEntity chapter = iChapterService.selectById(chapterId);
CourseEntity course = iCourseService.selectById(chapter.getCourseId());
SubjectEntity subject = iSubjectService.selectById(course.getSubjectId());
ChapterEntity parentChapter = iChapterService.selectById(chapter.getParentCode());
ChapterEntity nextChapter = iChapterService.selectNextChapter(chapter.getParentCode() , chapter.getId());
Page<QuestionEntity> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
Page<QuestionEntity> questionList = iQuestionService.selectPage(page , Condition.create().eq("chapter_id", chapterId).orderDesc(Arrays.asList("id")));
model.addObject("subject", subject);
model.addObject("course", course);
model.addObject("chapter", chapter);
model.addObject("parentChapter" , parentChapter);
model.addObject("nextChapter" , nextChapter);
model.addObject("questionList", questionList);
model.addObject("subjectId", course.getSubjectId());
model.addObject("courseId", course.getId());
return model;
} catch (Exception e) {
model.setViewName("404");
return model;
}
ChapterEntity chapter = iChapterService.selectById(chapterId);
CourseEntity course = iCourseService.selectById(chapter.getCourseId());
SubjectEntity subject = iSubjectService.selectById(course.getSubjectId());
ChapterEntity parentChapter = iChapterService.selectById(chapter.getParentCode());
ChapterEntity nextChapter = iChapterService.selectNextChapter(chapter.getParentCode() , chapter.getId());
Page<QuestionEntity> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
Page<QuestionEntity> questionList = iQuestionService.selectPage(page , Condition.create().eq("chapter_id", chapterId).orderDesc(Arrays.asList("id")));
model.addObject("subject", subject);
model.addObject("course", course);
model.addObject("chapter", chapter);
model.addObject("parentChapter" , parentChapter);
model.addObject("nextChapter" , nextChapter);
model.addObject("questionList", questionList);
model.addObject("subjectId", course.getSubjectId());
model.addObject("courseId", course.getId());
return model;
}
/**
@ -86,21 +80,15 @@ public class QuestionContrller {
@SuppressWarnings("unchecked")
@RequestMapping(value = {"/question/{uid}.html"}, method = RequestMethod.GET)
public ModelAndView question(@PathVariable String uid , ModelAndView model , HttpServletRequest request){
try {
// request url
logger.info("request url :{}" , request.getRequestURI());
model.setViewName("question");
QuestionEntity question = iQuestionService.selectById(uid);
question.setQuestionType(question.getQuestionType());
model.addObject("question", question);
model.addObject("course", iCourseService.selectById(question.getCourseId()));
model.addObject("answerList", iQuestionAnswerService.selectList(Condition.create().eq("question_id", uid).orderDesc(Arrays.asList("create_date"))));
return model;
} catch (Exception e) {
model.setViewName("404");
return model;
}
// request url
logger.info("request url :{}" , request.getRequestURI());
model.setViewName("question");
QuestionEntity question = iQuestionService.selectById(uid);
question.setQuestionType(question.getQuestionType());
model.addObject("question", question);
model.addObject("course", iCourseService.selectById(question.getCourseId()));
model.addObject("answerList", iQuestionAnswerService.selectList(Condition.create().eq("question_id", uid).orderDesc(Arrays.asList("create_date"))));
return model;
}
@RequestMapping(value = {"question/getQuestion/{uid}.html"}, method = RequestMethod.GET)

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

@ -54,37 +54,30 @@ public class SubjectController {
@SuppressWarnings("unchecked")
@RequestMapping(value = {"subject/{subjectId}.html"}, method = RequestMethod.GET)
public ModelAndView indexAction(@PathVariable String subjectId , HttpServletRequest request , ModelAndView model) {
try {
// request url
logger.info("request url :{} " , request.getRequestURI() );
SubjectEntity subject = iSubjectService.selectById(subjectId);
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId).orderAsc(Arrays.asList("sort")));
// 获取第一个科目
CourseEntity course = courseList.get(0);
// 获取第一本书
List<BookEntity> bookList = iBookService.selectList(Condition.create().eq("course_id", course.getId()));
List<ChapterEntity> chapterList = null;
if(bookList.size() > 0) {
BookEntity book = bookList.get(0);
chapterList = iChapterService.selectList(Condition.create().eq("book_id", book.getId()));
}
model.addObject("subject", subject);
model.addObject("course" , course);
model.addObject("courseList", courseList);
model.addObject("chapterList" , chapterList);
model.addObject("areaList", iSysAreaService.selectList(Condition.create().eq("tree_level", "0")));
if(BrowserUtils.isMobile(request.getHeader("user-agent"))) {
model.setViewName("mobile/subject");
}else {
model.setViewName("subject");
}
return model;
} catch (Exception e) {
logger.error(e.getMessage() , e);
model.setViewName("500");
return model;
// request url
logger.info("request url :{} " , request.getRequestURI() );
SubjectEntity subject = iSubjectService.selectById(subjectId);
List<CourseEntity> courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId).orderAsc(Arrays.asList("sort")));
// 获取第一个科目
CourseEntity course = courseList.get(0);
// 获取第一本书
List<BookEntity> bookList = iBookService.selectList(Condition.create().eq("course_id", course.getId()));
List<ChapterEntity> chapterList = null;
if(bookList.size() > 0) {
BookEntity book = bookList.get(0);
chapterList = iChapterService.selectList(Condition.create().eq("book_id", book.getId()));
}
model.addObject("subject", subject);
model.addObject("course" , course);
model.addObject("courseList", courseList);
model.addObject("chapterList" , chapterList);
model.addObject("areaList", iSysAreaService.selectList(Condition.create().eq("tree_level", "0")));
if(BrowserUtils.isMobile(request.getHeader("user-agent"))) {
model.setViewName("mobile/subject");
}else {
model.setViewName("subject");
}
return model;
}
// [{"value":"11","label":"北京市","children":[{"value":"1101","label":"市辖区"}]}]

Write Preview
Loading…
Cancel
Save