From f14923fb7833671401ca376e722be5091a3c26b1 Mon Sep 17 00:00:00 2001 From: tamguo Date: Tue, 9 Oct 2018 11:55:55 +0800 Subject: [PATCH] fix bug --- .../com/tamguo/service/impl/BookService.java | 2 +- .../tamguo/service/impl/QuestionService.java | 11 ++- .../tamguo/service/impl/SubjectService.java | 10 +-- .../test/java/com/tamguo/PaperCrawler.java | 12 +-- .../java/com/tamguo/PaperQuestionCrawler.java | 4 +- .../tamguo/web/tiku/SubjectController.java | 8 ++ .../resources/templates/mobile/subject.html | 78 ++----------------- 7 files changed, 35 insertions(+), 90 deletions(-) diff --git a/tamguo-crawler/src/main/java/com/tamguo/service/impl/BookService.java b/tamguo-crawler/src/main/java/com/tamguo/service/impl/BookService.java index 9e62a95..6aef284 100644 --- a/tamguo-crawler/src/main/java/com/tamguo/service/impl/BookService.java +++ b/tamguo-crawler/src/main/java/com/tamguo/service/impl/BookService.java @@ -53,7 +53,7 @@ public class BookService implements IBookService { @Autowired CacheService cacheService; private static final String FILES_NO_FORMAT = "0000000"; - private static final String FILES_PREFIX = "LIKESHUXUE"; + private static final String FILES_PREFIX = "LINCHZHIYEYISHI"; private static final String DOMAIN = "http://www.tamguo.com"; diff --git a/tamguo-crawler/src/main/java/com/tamguo/service/impl/QuestionService.java b/tamguo-crawler/src/main/java/com/tamguo/service/impl/QuestionService.java index d47fe47..4cb78d1 100644 --- a/tamguo-crawler/src/main/java/com/tamguo/service/impl/QuestionService.java +++ b/tamguo-crawler/src/main/java/com/tamguo/service/impl/QuestionService.java @@ -53,9 +53,8 @@ public class QuestionService extends ServiceImpl @Autowired CacheService cacheService; private static final String FILES_NO_FORMAT = "000000000"; - private static final String FILES_PREFIX = "zz"; - private static final String COURSE_ID = "zhengzhi"; - private static final String DOMAIN = "http://www.tamguo.com"; + private static final String FILES_PREFIX = "kyzz"; + private static final String COURSE_ID = "kaoyanzhengzhi"; private RunData runData; @@ -141,7 +140,7 @@ public class QuestionService extends ServiceImpl System.out.println("down images " + (ret?"success":"fail") + "：" + img); // 替换URL - question.setAnswer(question.getAnswer().replace(img, DOMAIN + "/files/question/" + COURSE_ID + '/' + fileDatePath + "/" + fileName)); + question.setAnswer(question.getAnswer().replace(img, "/files/question/" + COURSE_ID + '/' + fileDatePath + "/" + fileName)); } question.setAnswer(question.getAnswer()); } @@ -162,7 +161,7 @@ public class QuestionService extends ServiceImpl System.out.println("down images " + (ret?"success":"fail") + "：" + img); // 替换URL - question.setAnalysis(question.getAnalysis().replace(img, DOMAIN + "/files/question/" + COURSE_ID + '/' + fileDatePath + "/" + fileName)); + question.setAnalysis(question.getAnalysis().replace(img, "/files/question/" + COURSE_ID + '/' + fileDatePath + "/" + fileName)); } question.setAnalysis(question.getAnalysis()); } @@ -183,7 +182,7 @@ public class QuestionService extends ServiceImpl System.out.println("down images " + (ret?"success":"fail") + "：" + img); // 替换URL - question.setContent(question.getContent().replace(img, DOMAIN + "/files/question/" + COURSE_ID + '/' + fileDatePath + "/" + fileName)); + question.setContent(question.getContent().replace(img, "/files/question/" + COURSE_ID + '/' + fileDatePath + "/" + fileName)); } question.setContent(question.getContent()); } diff --git a/tamguo-crawler/src/main/java/com/tamguo/service/impl/SubjectService.java b/tamguo-crawler/src/main/java/com/tamguo/service/impl/SubjectService.java index 0a39ffb..6d21fb0 100644 --- a/tamguo-crawler/src/main/java/com/tamguo/service/impl/SubjectService.java +++ b/tamguo-crawler/src/main/java/com/tamguo/service/impl/SubjectService.java @@ -30,9 +30,9 @@ import com.xuxueli.crawler.rundata.RunData; @Service public class SubjectService implements ISubjectService{ - private final static String COURSE_ID = "zhengzhi"; - private final static String BOOK_ID = "1025976567395184649"; - private final static String SUBJECT_ID = "gaokao"; + private final static String COURSE_ID = "kaoyanzhengzhi"; + private final static String BOOK_ID = "1025976567395184651"; + private final static String SUBJECT_ID = "kaoyan"; @Autowired SubjectMapper subjectMapper; @Autowired @@ -53,7 +53,7 @@ public class SubjectService implements ISubjectService{ @Override public void crawlerSubject() { XxlCrawler crawler = new XxlCrawler.Builder() - .setUrls("https://tiku.baidu.com/tikupc/chapterlist/1bfd700abb68a98271fefa04-26-knowpoint-11") + .setUrls("https://tiku.baidu.com/tikupc/chapterlist/f3eb19e8b8f67c1cfad6b805-342-knowpoint-11") .setAllowSpread(false) .setFailRetryCount(5) .setThreadCount(20) @@ -63,7 +63,7 @@ public class SubjectService implements ISubjectService{ public void parse(Document html, Element pageVoElement, SubjectVo subjectVo) { // 解析封装 PageVo 对象 String pageUrl = html.baseUri(); - if(pageUrl.contains("https://tiku.baidu.com/tikupc/chapterlist/1bfd700abb68a98271fefa04-26-knowpoint-11")) { + if(pageUrl.contains("https://tiku.baidu.com/tikupc/chapterlist/f3eb19e8b8f67c1cfad6b805-342-knowpoint-11")) { logger.info("开始解析书籍：{}" , pageUrl); ChapterEntity chapterCondition = new ChapterEntity(); chapterCondition.setName(subjectVo.getChapterCurrName()); diff --git a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java index 99be562..e707e04 100644 --- a/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java +++ b/tamguo-crawler/src/test/java/com/tamguo/PaperCrawler.java @@ -29,18 +29,18 @@ public class PaperCrawler { // 高考 private final String SUBJECT_ID = "gaokao"; // 科目 - private final String COURSE_ID = "wenkeshuxue"; - // 110000 北京 | 310000 上海 | 500000 重庆 | 120100 天津 | 370000 山东 | 410000 河南 | 420000 湖北 | 320000 江苏 | 330000 浙江 + private final String COURSE_ID = "wuli"; + // 110000 北京 | 310000 上海 | 500000 重庆 | 120000 天津 | 370000 山东 | 410000 河南 | 420000 湖北 | 320000 江苏 | 330000 浙江 // 140000 山西 | 350000 福建 | 340000 安徽 | 220000 吉林 | 150000 内蒙古 | 640000 宁夏 | 650000 新疆 | 广西 450000 | 210000 辽宁 // 230000 黑龙江 | 610000 陕西 | 360000 江西 | 440000 广东 | 430000 湖南 | 460000 海南 | 530000 云南 | 510000 四川 | 630000 青海 // 620000 甘肃 | 130000 河北 | 540000 西藏 | 贵州 520000 - private final String AREA_ID = "140000"; + private final String AREA_ID = "350000"; // 年份 - 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 = "2"; // 开始采集的URL - private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-17-2-2015-741-1-download"; + private final String START_URL = "https://tiku.baidu.com/tikupc/paperlist/1bfd700abb68a98271fefa04-18-4-2016-799-1-download"; private RunData runData; diff --git a/tamguo-crawler/src/test/java/com/tamguo/PaperQuestionCrawler.java b/tamguo-crawler/src/test/java/com/tamguo/PaperQuestionCrawler.java index 900c57f..f22e4aa 100644 --- a/tamguo-crawler/src/test/java/com/tamguo/PaperQuestionCrawler.java +++ b/tamguo-crawler/src/test/java/com/tamguo/PaperQuestionCrawler.java @@ -63,8 +63,8 @@ public class PaperQuestionCrawler { @Autowired CacheService cacheService; private static final String FILES_NO_FORMAT = "000000000"; - private static final String FILES_PREFIX = "wenkeshuxue"; - private static final String COURSE_ID = "wenkeshuxue"; + private static final String FILES_PREFIX = "wuli"; + private static final String COURSE_ID = "wuli"; private RunData runData; 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 24e3d36..fadd964 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,15 +17,18 @@ import org.springframework.web.servlet.ModelAndView; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.mapper.Condition; +import com.baomidou.mybatisplus.plugins.Page; import com.tamguo.common.utils.Result; import com.tamguo.modules.sys.service.ISysAreaService; import com.tamguo.modules.tiku.model.BookEntity; import com.tamguo.modules.tiku.model.ChapterEntity; import com.tamguo.modules.tiku.model.CourseEntity; +import com.tamguo.modules.tiku.model.PaperEntity; import com.tamguo.modules.tiku.model.SubjectEntity; import com.tamguo.modules.tiku.service.IBookService; import com.tamguo.modules.tiku.service.IChapterService; import com.tamguo.modules.tiku.service.ICourseService; +import com.tamguo.modules.tiku.service.IPaperService; import com.tamguo.modules.tiku.service.ISubjectService; import com.tamguo.utils.BrowserUtils; @@ -50,6 +53,8 @@ public class SubjectController { private ICourseService iCourseService; @Autowired private IBookService iBookService; + @Autowired + private IPaperService iPaperService; @SuppressWarnings("unchecked") @RequestMapping(value = {"subject/{subjectId}.html"}, method = RequestMethod.GET) @@ -67,11 +72,14 @@ public class SubjectController { BookEntity book = bookList.get(0); chapterList = iChapterService.selectList(Condition.create().eq("book_id", book.getId())); } + // 获取最新的试卷 + Page paperPage = iPaperService.selectPage(new Page<>(1, 15) , Condition.create().eq("subject_id", subjectId).orderDesc(Arrays.asList("id"))); 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"))); + model.addObject("paperList", paperPage.getRecords()); if(BrowserUtils.isMobile(request.getHeader("user-agent"))) { model.setViewName("mobile/subject"); }else { diff --git a/tamguo-tms/src/main/resources/templates/mobile/subject.html b/tamguo-tms/src/main/resources/templates/mobile/subject.html index 6f3c78b..779c6e9 100644 --- a/tamguo-tms/src/main/resources/templates/mobile/subject.html +++ b/tamguo-tms/src/main/resources/templates/mobile/subject.html @@ -45,6 +45,10 @@
+

+ 考研科目 +

@@ -56,18 +60,15 @@

- +

为您推荐真题试卷更多 + th:href="${domainName + 'paperlist/'+subject.id+'-0-1-0-0-1.html'}">为您推荐最新试卷更多

    -
  • +
  • @@ -87,70 +88,7 @@
    - - -
    -

    - 为您推荐模拟试卷更多 -

    -
    -
      -
    • - -
      -
      -
      理科数学 东城区2017年高三上学期期末考试
      -
      - 北京 模拟 理科数学 -
      -
      -
      -
      • -
    -
    -
    - - - -
    -

    - 为您推荐热门试卷更多 -

    -
    -
      -
    • - -
      -
      -
      理科数学 东城区2017年高三上学期期末考试
      -
      - 北京 热门 理科数学 -
      -
      -
      -
      • -
    -
    -
    - +