smiletocandy@qq.com 7 years ago
parent 50f43d51ea
commit 55a8179b4b

@ -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/<project>=UTF-8

@ -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

@ -1,4 +0,0 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1

@ -1,15 +1,5 @@
package com.tamguo.web.member; 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.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.Condition; import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page; 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.model.enums.QuestionTypeEnum;
import com.tamguo.modules.tiku.service.IPaperService; import com.tamguo.modules.tiku.service.IPaperService;
import com.tamguo.utils.ShiroUtils; 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 @Controller
public class MemberPaperController { public class MemberPaperController {
@ -29,7 +29,7 @@ public class MemberPaperController {
@RequestMapping(value = "/member/paper.html", method = RequestMethod.GET) @RequestMapping(value = "/member/paper.html", method = RequestMethod.GET)
public ModelAndView paper(ModelAndView model, HttpSession session){ public ModelAndView paper(ModelAndView model){
model.setViewName("member/paperList"); model.setViewName("member/paperList");
return model; return model;
} }
@ -45,7 +45,7 @@ public class MemberPaperController {
@ResponseBody @ResponseBody
public Map<String, Object> paperList(String name , Integer page , Integer limit , HttpSession session){ public Map<String, Object> paperList(String name , Integer page , Integer limit , HttpSession session){
MemberEntity member = ((MemberEntity)session.getAttribute("currMember")); MemberEntity member = ((MemberEntity)session.getAttribute("currMember"));
Page<PaperEntity> list = iPaperService.selectPage(new Page<>(page , limit) , Condition.create().like("name", name).eq("creater_id", member.getId())); Page<PaperEntity> list = iPaperService.selectPage(new Page<PaperEntity>(page , limit) , Condition.create().like("name", name).eq("creater_id", member.getId()));
return Result.jqGridResult(list.getRecords(), list.getTotal(), limit, page, list.getPages()); return Result.jqGridResult(list.getRecords(), list.getTotal(), limit, page, list.getPages());
} }

@ -1,18 +1,5 @@
package com.tamguo.web.tiku; 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.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.tamguo.common.utils.SystemConstant; 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.modules.tiku.service.ISubjectService;
import com.tamguo.utils.BrowserUtils; import com.tamguo.utils.BrowserUtils;
import com.tamguo.utils.PageUtils; 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 - * Controller -
@ -119,10 +118,10 @@ public class PaperController {
model.addObject("questionList", iQuestionService.selectList(Condition.create().eq("paper_id", paperId))); 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("zhentiPaperList", iPaperService.selectPage(new Page<PaperEntity>(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("moniPaperList", iPaperService.selectPage(new Page<PaperEntity>(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("yatiPaperList", iPaperService.selectPage(new Page<PaperEntity>(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("hotPaperList", iPaperService.selectPage(new Page<PaperEntity>(1, 5) , Condition.create().eq("subject_id", paper.getSubjectId()).eq("course_id", paper.getCourseId())).getRecords());
if(BrowserUtils.isMobile(request.getHeader("user-agent"))) { if(BrowserUtils.isMobile(request.getHeader("user-agent"))) {

@ -1,10 +1,13 @@
package com.tamguo.web.tiku; package com.tamguo.web.tiku;
import java.util.Arrays; import com.alibaba.fastjson.JSONArray;
import java.util.List; import com.baomidou.mybatisplus.mapper.Condition;
import com.baomidou.mybatisplus.plugins.Page;
import javax.servlet.http.HttpServletRequest; 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.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; 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.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import com.alibaba.fastjson.JSONArray; import javax.servlet.http.HttpServletRequest;
import com.baomidou.mybatisplus.mapper.Condition; import java.util.Arrays;
import com.baomidou.mybatisplus.plugins.Page; import java.util.List;
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;
/** /**
* Controller - * Controller -
@ -73,7 +63,7 @@ public class SubjectController {
chapterList = iChapterService.selectList(Condition.create().eq("book_id", book.getId())); chapterList = iChapterService.selectList(Condition.create().eq("book_id", book.getId()));
} }
// 获取最新的试卷 // 获取最新的试卷
Page<PaperEntity> paperPage = iPaperService.selectPage(new Page<>(1, 15) , Condition.create().eq("subject_id", subjectId).orderDesc(Arrays.asList("id"))); Page<PaperEntity> paperPage = iPaperService.selectPage(new Page<PaperEntity>(1, 15) , Condition.create().eq("subject_id", subjectId).orderDesc(Arrays.asList("id")));
model.addObject("subject", subject); model.addObject("subject", subject);
model.addObject("course" , course); model.addObject("course" , course);
model.addObject("courseList", courseList); model.addObject("courseList", courseList);
@ -103,4 +93,5 @@ public class SubjectController {
JSONArray list = iSubjectService.getSubjectTree(); JSONArray list = iSubjectService.getSubjectTree();
return Result.successResult(list); return Result.successResult(list);
} }
} }

@ -41,10 +41,10 @@
<li class="contain-li"><a class="contain-link" style="color:#fff;" <li class="contain-li"><a class="contain-link" style="color:#fff;"
href="http://www.xunaiquan.com/" target="_blank" title="找狗,寻狗">寻爱犬</a></li> href="http://www.xunaiquan.com/" target="_blank" title="找狗,寻狗">寻爱犬</a></li>
<li class="contain-li"><a class="contain-link" <li class="contain-li"><a class="contain-link"
href="http://www.0791zikaow.com/" style="color:#fff;" target="_blank" title="江西自考网">江西自考</a> href="http://www.ibeifeng.com/" style="color:#fff;" target="_blank" title="北风网">北风</a>
</li> </li>
<li class="contain-li"><a class="contain-link" <li class="contain-li"><a class="contain-link"
href="http://sh.kaoyan365.cn/" style="color:#fff;" target="_blank" title="上海研究生招生信息网">上海研究生招生信息</a> href="http://sh.kaoyan365.cn/" style="color:#fff;" target="_blank" title="上海研究生招生信息网">研究生网</a>
</li> </li>
</ul> </ul>
</div> </div>

Loading…
Cancel
Save