From 55a8179b4b256c5e6b9764c297573e048ce11857 Mon Sep 17 00:00:00 2001 From: "smiletocandy@qq.com" Date: Wed, 23 Jan 2019 13:55:23 +0800 Subject: [PATCH] IDEA --- .../org.eclipse.core.resources.prefs | 6 ---- .../.settings/org.eclipse.jdt.core.prefs | 5 --- .../.settings/org.eclipse.m2e.core.prefs | 4 --- tamguo-tms/pom.xml | 12 +++---- .../web/member/MemberPaperController.java | 24 ++++++------- .../com/tamguo/web/tiku/PaperController.java | 33 +++++++++-------- .../tamguo/web/tiku/SubjectController.java | 35 +++++++------------ .../resources/templates/include/footer.html | 4 +-- 8 files changed, 49 insertions(+), 74 deletions(-) delete mode 100644 tamguo-tms/.settings/org.eclipse.core.resources.prefs delete mode 100644 tamguo-tms/.settings/org.eclipse.jdt.core.prefs delete mode 100644 tamguo-tms/.settings/org.eclipse.m2e.core.prefs diff --git a/tamguo-tms/.settings/org.eclipse.core.resources.prefs b/tamguo-tms/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 04cfa2c..0000000 --- a/tamguo-tms/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding//src/main/resources=UTF-8 -encoding//src/test/java=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/tamguo-tms/.settings/org.eclipse.jdt.core.prefs b/tamguo-tms/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index d59e09c..0000000 --- a/tamguo-tms/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/tamguo-tms/.settings/org.eclipse.m2e.core.prefs b/tamguo-tms/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index 14b697b..0000000 --- a/tamguo-tms/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/tamguo-tms/pom.xml b/tamguo-tms/pom.xml index 5c8b1c5..c016675 100644 --- a/tamguo-tms/pom.xml +++ b/tamguo-tms/pom.xml @@ -135,12 +135,12 @@ blade-patchca 1.0.5 - - - com.tamguo - tamguo-modules-core - 1.0.0 - + + + com.tamguo + tamguo-modules-core + 1.0.0 + diff --git a/tamguo-tms/src/main/java/com/tamguo/web/member/MemberPaperController.java b/tamguo-tms/src/main/java/com/tamguo/web/member/MemberPaperController.java index 36f1665..d89925b 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/member/MemberPaperController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/member/MemberPaperController.java @@ -1,15 +1,5 @@ package com.tamguo.web.member; -import java.util.Map; -import javax.servlet.http.HttpSession; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.servlet.ModelAndView; - import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.plugins.Page; @@ -20,6 +10,16 @@ import com.tamguo.modules.tiku.model.PaperEntity; import com.tamguo.modules.tiku.model.enums.QuestionTypeEnum; import com.tamguo.modules.tiku.service.IPaperService; import com.tamguo.utils.ShiroUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpSession; +import java.util.Map; @Controller public class MemberPaperController { @@ -29,7 +29,7 @@ public class MemberPaperController { @RequestMapping(value = "/member/paper.html", method = RequestMethod.GET) - public ModelAndView paper(ModelAndView model, HttpSession session){ + public ModelAndView paper(ModelAndView model){ model.setViewName("member/paperList"); return model; } @@ -45,7 +45,7 @@ public class MemberPaperController { @ResponseBody public Map paperList(String name , Integer page , Integer limit , HttpSession session){ MemberEntity member = ((MemberEntity)session.getAttribute("currMember")); - Page list = iPaperService.selectPage(new Page<>(page , limit) , Condition.create().like("name", name).eq("creater_id", member.getId())); + Page list = iPaperService.selectPage(new Page(page , limit) , Condition.create().like("name", name).eq("creater_id", member.getId())); return Result.jqGridResult(list.getRecords(), list.getTotal(), limit, page, list.getPages()); } diff --git a/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java b/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java index 05ce03a..1c984c0 100644 --- a/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java +++ b/tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java @@ -1,18 +1,5 @@ package com.tamguo.web.tiku; -import java.util.List; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; -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.baomidou.mybatisplus.plugins.Page; import com.tamguo.common.utils.SystemConstant; @@ -27,6 +14,18 @@ import com.tamguo.modules.tiku.service.IQuestionService; import com.tamguo.modules.tiku.service.ISubjectService; import com.tamguo.utils.BrowserUtils; import com.tamguo.utils.PageUtils; +import org.apache.commons.lang3.StringUtils; +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 javax.servlet.http.HttpServletRequest; +import java.util.List; /** * Controller - 试卷 @@ -119,10 +118,10 @@ public class PaperController { model.addObject("questionList", iQuestionService.selectList(Condition.create().eq("paper_id", paperId))); // 获取推荐试卷 - model.addObject("zhentiPaperList", iPaperService.selectPage(new Page<>(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("type",SystemConstant.ZHENGTI_PAPER_ID)).getRecords()); - model.addObject("moniPaperList", iPaperService.selectPage(new Page<>(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("type",SystemConstant.MONI_PAPER_ID)).getRecords()); - model.addObject("yatiPaperList", iPaperService.selectPage(new Page<>(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("type",SystemConstant.YATI_PAPER_ID)).getRecords()); - model.addObject("hotPaperList", iPaperService.selectPage(new Page<>(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("course_id", paper.getCourseId())).getRecords()); + model.addObject("zhentiPaperList", iPaperService.selectPage(new Page(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("type",SystemConstant.ZHENGTI_PAPER_ID)).getRecords()); + model.addObject("moniPaperList", iPaperService.selectPage(new Page(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("type",SystemConstant.MONI_PAPER_ID)).getRecords()); + model.addObject("yatiPaperList", iPaperService.selectPage(new Page(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("type",SystemConstant.YATI_PAPER_ID)).getRecords()); + model.addObject("hotPaperList", iPaperService.selectPage(new Page(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("course_id", paper.getCourseId())).getRecords()); if(BrowserUtils.isMobile(request.getHeader("user-agent"))) { 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 3a600eb..c5fd4b2 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 @@ -1,10 +1,13 @@ package com.tamguo.web.tiku; -import java.util.Arrays; -import java.util.List; - -import javax.servlet.http.HttpServletRequest; - +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.*; +import com.tamguo.modules.tiku.service.*; +import com.tamguo.utils.BrowserUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -15,22 +18,9 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; 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.KnowPointEntity; -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.IKnowPointService; -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; +import javax.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.List; /** * Controller - 考试（高考，建造师，医药师） @@ -73,7 +63,7 @@ public class SubjectController { 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"))); + 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); @@ -103,4 +93,5 @@ public class SubjectController { JSONArray list = iSubjectService.getSubjectTree(); return Result.successResult(list); } + } diff --git a/tamguo-tms/src/main/resources/templates/include/footer.html b/tamguo-tms/src/main/resources/templates/include/footer.html index 6e3b5fe..8e9e44d 100644 --- a/tamguo-tms/src/main/resources/templates/include/footer.html +++ b/tamguo-tms/src/main/resources/templates/include/footer.html @@ -41,10 +41,10 @@
  • 寻爱犬
  • 江西自考网 + href="http://www.ibeifeng.com/" style="color:#fff;" target="_blank" title="北风网">北风网
  • 上海研究生招生信息网 + href="http://sh.kaoyan365.cn/" style="color:#fff;" target="_blank" title="上海研究生招生信息网">研究生网