diff --git a/tamguo-crawler/src/main/java/com/tamguo/config/dao/SuperEntity.java b/tamguo-crawler/src/main/java/com/tamguo/config/dao/SuperEntity.java index d59c2c8..de1ba02 100644 --- a/tamguo-crawler/src/main/java/com/tamguo/config/dao/SuperEntity.java +++ b/tamguo-crawler/src/main/java/com/tamguo/config/dao/SuperEntity.java @@ -12,18 +12,19 @@ public class SuperEntity> extends Model { private static final long serialVersionUID = 1L; @TableId("id") - private String uid; + private String id; @Override protected Serializable pkVal() { - return this.getUid(); + return this.getId(); } - public String getUid() { - return uid; + public String getId() { + return id; } - public void setUid(String uid) { - this.uid = uid; + public void setId(String id) { + this.id = id; } + } 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 ea611b9..9e62a95 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 @@ -98,8 +98,8 @@ public class BookService implements IBookService { } question.setAnswer(questionVo.getAnswer()); question.setAuditStatus("1"); - question.setChapterId(chapter.getUid()); - question.setCourseId(course.getUid()); + question.setChapterId(chapter.getId()); + question.setCourseId(course.getId()); question.setPaperId(null); question.setQuestionType(questionType.getValue().toString()); if(questionVo.getReviewPoint() != null && questionVo.getReviewPoint().size() > 0) { @@ -119,7 +119,7 @@ public class BookService implements IBookService { question.setYear(questionVo.getYear()); } } - question.setSubjectId(subject.getUid()); + question.setSubjectId(subject.getId()); if (questionVo.getAnswerImages()!=null && questionVo.getAnswerImages().size() > 0) { Set imagesSet = new HashSet<>(questionVo.getAnswerImages()); diff --git a/tamguo-crawler/src/main/java/com/tamguo/service/impl/ChapterService.java b/tamguo-crawler/src/main/java/com/tamguo/service/impl/ChapterService.java index b021ba6..8f8df8b 100644 --- a/tamguo-crawler/src/main/java/com/tamguo/service/impl/ChapterService.java +++ b/tamguo-crawler/src/main/java/com/tamguo/service/impl/ChapterService.java @@ -51,19 +51,19 @@ public class ChapterService implements IChapterService{ @Override public void modifyQuestionNum() { int page = 1; - int pageSize = 1000; + int pageSize = 100; while(true) { Page chapterPage = new Page(page , pageSize); List chapterList = chapterMapper.queryList(chapterPage); for(int i=0 ;i bookEntities = bookMapper.selectList(Condition.EMPTY); for (BookEntity bookEntity : bookEntities) { String url = bookEntity.getReserveField1(); - String bookId = bookEntity.getUid(); + String bookId = bookEntity.getId(); String regexs = url.replaceAll("\\d+", "\\\\d+").replaceAll("\\.","\\\\."); XxlCrawler crawler = new XxlCrawler.Builder() 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 5059532..d7e1e28 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 @@ -100,8 +100,8 @@ public class QuestionService implements IQuestionService{ } question.setAnswer(questionVo.getAnswer()); question.setAuditStatus("1"); - question.setChapterId(chapter.getUid()); - question.setCourseId(course.getUid()); + question.setChapterId(chapter.getId()); + question.setCourseId(course.getId()); question.setPaperId(null); question.setQuestionType(questionType.getValue().toString()); if(questionVo.getReviewPoint() != null && questionVo.getReviewPoint().size() > 0) { @@ -121,7 +121,7 @@ public class QuestionService implements IQuestionService{ question.setYear(questionVo.getYear()); } } - question.setSubjectId(subject.getUid()); + question.setSubjectId(subject.getId()); if (questionVo.getAnswerImages()!=null && questionVo.getAnswerImages().size() > 0) { Set imagesSet = new HashSet<>(questionVo.getAnswerImages()); 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 04b0b14..7d0cd5b 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 @@ -91,7 +91,7 @@ public class SubjectService implements ISubjectService{ logger.info(chapterName); ChapterEntity chapter = new ChapterEntity(); chapter.setCourseId(COURSE_ID); - chapter.setParentCode(rootChapter.getUid()); + chapter.setParentCode(rootChapter.getId()); chapter.setName(chapterName); chapter.setQuestionNum(0); chapter.setPointNum(0); @@ -100,7 +100,7 @@ public class SubjectService implements ISubjectService{ chapter.setTreeLeaf(false); chapter.setTreeLevel(1); chapterMapper.insert(chapter); - chapter.setParentCodes(rootChapter.getParentCodes() + chapter.getUid() + ","); + chapter.setParentCodes(rootChapter.getParentCodes() + chapter.getId() + ","); chapterMapper.updateById(chapter); Elements detailKpoint1s = element.getElementsByClass("detail-kpoint-1"); @@ -114,7 +114,7 @@ public class SubjectService implements ISubjectService{ ChapterEntity chapter1 = new ChapterEntity(); chapter1.setCourseId(COURSE_ID); chapter1.setBookId(BOOK_ID); - chapter1.setParentCode(chapter.getUid()); + chapter1.setParentCode(chapter.getId()); chapter1.setName(chapterName1); chapter1.setQuestionNum(0); chapter1.setPointNum(0); @@ -123,7 +123,7 @@ public class SubjectService implements ISubjectService{ chapter1.setTreeLeaf(false); chapter1.setTreeLevel(2); chapterMapper.insert(chapter1); - chapter1.setParentCodes(chapter.getParentCodes() + chapter1.getUid() + ","); + chapter1.setParentCodes(chapter.getParentCodes() + chapter1.getId() + ","); chapterMapper.updateById(chapter1); @@ -136,7 +136,7 @@ public class SubjectService implements ISubjectService{ ChapterEntity chapter2 = new ChapterEntity(); chapter2.setCourseId(COURSE_ID); chapter2.setBookId(BOOK_ID); - chapter2.setParentCode(chapter1.getUid()); + chapter2.setParentCode(chapter1.getId()); chapter2.setName(chapterName2); chapter2.setQuestionNum(0); chapter2.setPointNum(0); @@ -144,7 +144,7 @@ public class SubjectService implements ISubjectService{ chapter2.setTreeLeaf(true); chapter2.setTreeLevel(3); chapterMapper.insert(chapter2); - chapter2.setParentCodes(chapter1.getParentCodes() + chapter2.getUid() + ","); + chapter2.setParentCodes(chapter1.getParentCodes() + chapter2.getId() + ","); chapterMapper.updateById(chapter2); Elements maskList = detailKpoint.getElementsByClass("mask"); @@ -178,7 +178,7 @@ public class SubjectService implements ISubjectService{ if(crawlerQuestionMapper.selectOne(condition) == null) { CrawlerQuestionEntity crawlerQuestion = new CrawlerQuestionEntity(); crawlerQuestion.setQuestionUrl(questionUrl); - crawlerQuestion.setChapterId(chapterEntity.getUid()); + crawlerQuestion.setChapterId(chapterEntity.getId()); crawlerQuestion.setStatus("0"); crawlerQuestionMapper.insert(crawlerQuestion); }else { diff --git a/tamguo-crawler/src/main/resources/mappers/ChapterMapper.xml b/tamguo-crawler/src/main/resources/mappers/ChapterMapper.xml index bfc8a3d..f5aa444 100644 --- a/tamguo-crawler/src/main/resources/mappers/ChapterMapper.xml +++ b/tamguo-crawler/src/main/resources/mappers/ChapterMapper.xml @@ -3,7 +3,7 @@