From 7d5fd3fb56f1274153f103ff2e32afbb530d5e57 Mon Sep 17 00:00:00 2001 From: tamguo Date: Sat, 4 Aug 2018 21:11:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=91=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/tiku/dao/ChapterMapper.java | 8 ++ .../tamguo/modules/tiku/model/BookEntity.java | 19 ++-- .../modules/tiku/model/ChapterEntity.java | 93 +++++++++++++++++++ .../modules/tiku/model/CourseEntity.java | 14 +-- .../modules/tiku/model/SubjectEntity.java | 15 +-- .../modules/tiku/service/IChapterService.java | 8 ++ .../tiku/service/impl/ChapterServiceImpl.java | 12 +++ .../tiku/service/impl/CourseServiceImpl.java | 6 +- .../tiku/service/impl/SubjectServiceImpl.java | 2 +- .../tamguo/config/web/ThymeleafConfig.java | 4 + .../tamguo/web/tiku/SubjectController.java | 76 +++++++++++++++ .../src/main/resources/templates/500.html | 2 +- .../src/main/resources/templates/subject.html | 92 +++++++++--------- 13 files changed, 277 insertions(+), 74 deletions(-) create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/ChapterMapper.java create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/ChapterEntity.java create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IChapterService.java create mode 100644 tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/ChapterServiceImpl.java create mode 100644 tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/ChapterMapper.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/ChapterMapper.java new file mode 100644 index 0000000..a8b97fb --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/dao/ChapterMapper.java @@ -0,0 +1,8 @@ +package com.tamguo.modules.tiku.dao; + +import com.tamguo.config.dao.SuperMapper; +import com.tamguo.modules.tiku.model.ChapterEntity; + +public interface ChapterMapper extends SuperMapper{ + +} diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/BookEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/BookEntity.java index 89dfb0e..22a0581 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/BookEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/BookEntity.java @@ -5,6 +5,7 @@ import java.util.Date; import com.alibaba.fastjson.annotation.JSONField; import com.alibaba.fastjson.serializer.SerializerFeature; import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.FieldFill; import com.tamguo.modules.tiku.model.enums.CourseStatusEnum; @@ -12,7 +13,8 @@ import com.tamguo.modules.tiku.model.enums.CourseStatusEnum; @TableName(value="tiku_book") public class BookEntity { - private String uid; + @TableId + private String id; private String subjectId; private String courseId; private String name; @@ -38,13 +40,6 @@ public class BookEntity { @TableField(exist=false) private String courseName; - public String getUid() { - return uid; - } - - public void setUid(String uid) { - this.uid = uid; - } public String getSubjectId() { return subjectId; @@ -157,5 +152,13 @@ public class BookEntity { public void setCourseName(String courseName) { this.courseName = courseName; } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/ChapterEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/ChapterEntity.java new file mode 100644 index 0000000..87f798d --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/ChapterEntity.java @@ -0,0 +1,93 @@ +package com.tamguo.modules.tiku.model; + +import java.io.Serializable; +import com.baomidou.mybatisplus.annotations.TableField; +import com.baomidou.mybatisplus.annotations.TableName; +import com.tamguo.config.dao.SuperEntity; + +import java.util.List; + + +/** + * The persistent class for the tiku_chapter database table. + * + */ +@TableName(value="tiku_chapter") +public class ChapterEntity extends SuperEntity implements Serializable { + private static final long serialVersionUID = 1L; + + private String courseId; + + private String name; + + private String parentId; + + private Integer questionNum; + + private Integer pointNum; + + private Integer orders; + + @TableField(exist=false) + private List childChapterList; + + public ChapterEntity() { + } + + public String getCourseId() { + return this.courseId; + } + + public void setCourseId(String courseId) { + this.courseId = courseId; + } + + public String getName() { + return this.name; + } + + public void setName(String name) { + this.name = name; + } + + public String getParentId() { + return this.parentId; + } + + public void setParentId(String parentId) { + this.parentId = parentId; + } + + public List getChildChapterList() { + return childChapterList; + } + + public void setChildChapterList(List childChapterList) { + this.childChapterList = childChapterList; + } + + public Integer getQuestionNum() { + return questionNum; + } + + public void setQuestionNum(Integer questionNum) { + this.questionNum = questionNum; + } + + public Integer getPointNum() { + return pointNum; + } + + public void setPointNum(Integer pointNum) { + this.pointNum = pointNum; + } + + public Integer getOrders() { + return orders; + } + + public void setOrders(Integer orders) { + this.orders = orders; + } + +} \ No newline at end of file diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java index 7eba7ff..65f9744 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/CourseEntity.java @@ -13,7 +13,7 @@ import com.tamguo.modules.tiku.model.enums.CourseStatusEnum; public class CourseEntity { @TableId - private String uid; + private String id; private String subjectId; private String name; private Integer sort; @@ -33,12 +33,6 @@ public class CourseEntity { @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) private CourseStatusEnum status; - public String getUid() { - return uid; - } - public void setUid(String uid) { - this.uid = uid; - } public String getSubjectId() { return subjectId; } @@ -105,5 +99,11 @@ public class CourseEntity { public void setRemarks(String remarks) { this.remarks = remarks; } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java index af27368..6ac9927 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/model/SubjectEntity.java @@ -13,7 +13,7 @@ import com.tamguo.modules.tiku.model.enums.SubjectStatusEnum; public class SubjectEntity { @TableId - private String uid; + private String id; private String name; private String sort; @@ -31,12 +31,7 @@ public class SubjectEntity { @JSONField(serialzeFeatures= SerializerFeature.WriteEnumUsingToString) private SubjectStatusEnum status; - public String getUid() { - return uid; - } - public void setUid(String uid) { - this.uid = uid; - } + public String getName() { return name; } @@ -85,5 +80,11 @@ public class SubjectEntity { public void setRemarks(String remarks) { this.remarks = remarks; } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } } diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IChapterService.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IChapterService.java new file mode 100644 index 0000000..eb563dc --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/IChapterService.java @@ -0,0 +1,8 @@ +package com.tamguo.modules.tiku.service; + +import com.baomidou.mybatisplus.service.IService; +import com.tamguo.modules.tiku.model.ChapterEntity; + +public interface IChapterService extends IService{ + +} diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/ChapterServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/ChapterServiceImpl.java new file mode 100644 index 0000000..850b6d6 --- /dev/null +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/ChapterServiceImpl.java @@ -0,0 +1,12 @@ +package com.tamguo.modules.tiku.service.impl; + +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.tamguo.modules.tiku.dao.ChapterMapper; +import com.tamguo.modules.tiku.model.ChapterEntity; +import com.tamguo.modules.tiku.service.IChapterService; + +@Service +public class ChapterServiceImpl extends ServiceImpl implements IChapterService{ + +} diff --git a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java index 912ef65..5ea61bd 100644 --- a/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java +++ b/tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/CourseServiceImpl.java @@ -62,7 +62,7 @@ public class CourseServiceImpl extends ServiceImpl i @Transactional(readOnly=false) @Override public void update(CourseEntity course) { - CourseEntity entity = courseMapper.selectById(course.getUid()); + CourseEntity entity = courseMapper.selectById(course.getId()); entity.setName(course.getName()); entity.setSubjectId(course.getSubjectId()); entity.setSort(course.getSort()); @@ -106,14 +106,14 @@ public class CourseServiceImpl extends ServiceImpl i JSONArray entitys = new JSONArray(); for(int i=0 ; i vars = new HashMap<>(); vars.put("domainName", env.getProperty("domain.name")); + vars.put("PAPER_TYPE_ZHENTI", "1"); + vars.put("PAPER_TYPE_MONI", "2"); + vars.put("PAPER_TYPE_YATI", "3"); + vars.put("PAPER_TYPE_MINGXIAO", "4"); viewResolver.setStaticVariables(vars); } } 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 new file mode 100644 index 0000000..31fb3e5 --- /dev/null +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/SubjectController.java @@ -0,0 +1,76 @@ +package com.tamguo.web.tiku; + +import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.servlet.ModelAndView; + +import com.baomidou.mybatisplus.mapper.Condition; +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.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.ISubjectService; + +/** + * Controller - 考试（高考，建造师，医药师） + * + * @author candy.tam + * + */ +@Controller +public class SubjectController { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private IChapterService iChapterService; + @Autowired + private ISysAreaService iSysAreaService; + @Autowired + private ISubjectService iSubjectService; + @Autowired + private ICourseService iCourseService; + @Autowired + private IBookService iBookService; + + + @SuppressWarnings("unchecked") + @RequestMapping(value = {"subject/{subjectId}.html"}, method = RequestMethod.GET) + public ModelAndView indexAction(@PathVariable String subjectId , ModelAndView model) { + try { + SubjectEntity subject = iSubjectService.selectById(subjectId); + List courseList = iCourseService.selectList(Condition.create().eq("subject_id", subjectId)); + // 获取第一个科目 + CourseEntity course = courseList.get(0); + // 获取第一本书 + List bookList = iBookService.selectList(Condition.create().eq("course_id", course.getId())); + List chapterList = null; + if(bookList.size() > 0) { + BookEntity book = bookList.get(0); + chapterList = iChapterService.selectList(Condition.create().eq("book_id", book.getId())); + } + model.setViewName("subject"); + 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"))); + return model; + } catch (Exception e) { + logger.error(e.getMessage() , e); + model.setViewName("500"); + return model; + } + + } +} diff --git a/tamguo-tms/src/main/resources/templates/500.html b/tamguo-tms/src/main/resources/templates/500.html index 38f36b1..e8144e1 100644 --- a/tamguo-tms/src/main/resources/templates/500.html +++ b/tamguo-tms/src/main/resources/templates/500.html @@ -3,7 +3,7 @@ 探果题库_错误页面 - + 服务器异常! diff --git a/tamguo-tms/src/main/resources/templates/subject.html b/tamguo-tms/src/main/resources/templates/subject.html index 37163c6..81ee5ba 100644 --- a/tamguo-tms/src/main/resources/templates/subject.html +++ b/tamguo-tms/src/main/resources/templates/subject.html @@ -2,20 +2,18 @@ - 探果题库_聪明的学生都在这里 + 探果题库_聪明的学生都在这里 - - - - - - - - - + + + + + + + @@ -30,23 +28,23 @@
- 高考 + 高考
@@ -54,7 +52,7 @@ -