pbn32vpxk
/
tamguo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bug

Browse Source
main
tamguo 7 years ago
parent 07eedc9144
commit 13309c11e3
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File

7
tamguo-modules-core/src/main/java/com/tamguo/modules/tiku/service/impl/PaperServiceImpl.java
Unescape View File

@ -1,5 +1,6 @@
package com.tamguo.modules.tiku.service.impl; package com.tamguo.modules.tiku.service.impl;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ -36,7 +37,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, PaperEntity> impl
List<PaperEntity> paperList = (List<PaperEntity>) cacheService.getObject(SystemConstant.HISTORY_PAPER); List<PaperEntity> paperList = (List<PaperEntity>) cacheService.getObject(SystemConstant.HISTORY_PAPER);
if(paperList == null){ if(paperList == null){
Page<PaperEntity> page = new Page<>(1 , 6); Page<PaperEntity> page = new Page<>(1 , 6);
paperList = paperMapper.selectPage(page, Condition.create().eq("type", SystemConstant.ZHENGTI_PAPER_ID).eq("area_id", SystemConstant.BEIJING_AREA_ID)); paperList = paperMapper.selectPage(page, Condition.create().eq("type", SystemConstant.ZHENGTI_PAPER_ID).eq("area_id", SystemConstant.BEIJING_AREA_ID).orderDesc(Arrays.asList("id")));
cacheService.setObject(SystemConstant.HISTORY_PAPER, paperList , 2 * 60 * 60); cacheService.setObject(SystemConstant.HISTORY_PAPER, paperList , 2 * 60 * 60);
} }
return paperList; return paperList;
@ -48,7 +49,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, PaperEntity> impl
List<PaperEntity> paperList = (List<PaperEntity>) cacheService.getObject(SystemConstant.SIMULATION_PAPER); List<PaperEntity> paperList = (List<PaperEntity>) cacheService.getObject(SystemConstant.SIMULATION_PAPER);
if(paperList == null){ if(paperList == null){
Page<PaperEntity> page = new Page<>(1 , 6); Page<PaperEntity> page = new Page<>(1 , 6);
paperList = paperMapper.selectPage(page, Condition.create().eq("type", SystemConstant.MONI_PAPER_ID).eq("area_id", SystemConstant.BEIJING_AREA_ID)); paperList = paperMapper.selectPage(page, Condition.create().eq("type", SystemConstant.MONI_PAPER_ID).eq("area_id", SystemConstant.BEIJING_AREA_ID).orderDesc(Arrays.asList("id")));
cacheService.setObject(SystemConstant.SIMULATION_PAPER, paperList , 2 * 60 * 60); cacheService.setObject(SystemConstant.SIMULATION_PAPER, paperList , 2 * 60 * 60);
} }
return paperList; return paperList;
@ -60,7 +61,7 @@ public class PaperServiceImpl extends ServiceImpl<PaperMapper, PaperEntity> impl
List<PaperEntity> paperList = (List<PaperEntity>) cacheService.getObject(SystemConstant.HOT_PAPER); List<PaperEntity> paperList = (List<PaperEntity>) cacheService.getObject(SystemConstant.HOT_PAPER);
if(paperList == null){ if(paperList == null){
Page<PaperEntity> page = new Page<>(1 , 10); Page<PaperEntity> page = new Page<>(1 , 10);
paperList = paperMapper.selectPage(page, Condition.create().eq("area_id", areaId)); paperList = paperMapper.selectPage(page, Condition.create().eq("area_id", areaId).orderDesc(Arrays.asList("id")));
cacheService.setObject(SystemConstant.HOT_PAPER, paperList , 2 * 60 * 60); cacheService.setObject(SystemConstant.HOT_PAPER, paperList , 2 * 60 * 60);
} }
return paperList; return paperList;

28
tamguo-tms/src/main/java/com/tamguo/utils/PageUtils.java
Unescape View File

@ -14,16 +14,16 @@ public class PageUtils {
private Boolean isShowPreBtn = false; private Boolean isShowPreBtn = false;
// 当前页 // 当前页
private String currPageNum; private Integer currPageNum;
// 页码列表 // 页码列表
private List<String> pageNums; private List<String> pageNums;
// 总页数 // 总页数
private String totalPage; private Integer totalPage;
// 总数量 // 总数量
private String total; private Integer total;
// 数据 // 数据
private List<?> list; private List<?> list;
@ -47,9 +47,9 @@ public class PageUtils {
pgNums.add(((Integer)(page.getCurrent() - 2)).toString()); pgNums.add(((Integer)(page.getCurrent() - 2)).toString());
pgNums.add(((Integer)(page.getCurrent() - 1)).toString()); pgNums.add(((Integer)(page.getCurrent() - 1)).toString());
pgNums.add(((Integer)page.getCurrent()).toString()); pgNums.add(((Integer)page.getCurrent()).toString());
}else{ } else {
pgNums.add(((Integer)(page.getCurrent() - 1)).toString()); pgNums.add(((Integer)(page.getCurrent() - 1)).toString());
pgNums.add(((Integer)page.getCurrent()).toString()); pgNums.add(((Integer)(page.getCurrent())).toString());
pgNums.add(((Integer)(page.getCurrent() + 1)).toString()); pgNums.add(((Integer)(page.getCurrent() + 1)).toString());
} }
}else{ }else{
@ -78,9 +78,9 @@ public class PageUtils {
} }
pg.setPageNums(pgNums); pg.setPageNums(pgNums);
pg.setList(page.getRecords()); pg.setList(page.getRecords());
pg.setCurrPageNum(((Integer)page.getCurrent()).toString()); pg.setCurrPageNum(((Integer)page.getCurrent()));
pg.setTotal(((Integer)page.getTotal()).toString()); pg.setTotal(((Integer)page.getTotal()));
pg.setTotalPage(((Integer)page.getPages()).toString()); pg.setTotalPage(((Integer)page.getPages()));
return pg; return pg;
} }
@ -120,32 +120,32 @@ public class PageUtils {
} }
public String getCurrPageNum() { public Integer getCurrPageNum() {
return currPageNum; return currPageNum;
} }
public void setCurrPageNum(String currPageNum) { public void setCurrPageNum(Integer currPageNum) {
this.currPageNum = currPageNum; this.currPageNum = currPageNum;
} }
public String getTotalPage() { public Integer getTotalPage() {
return totalPage; return totalPage;
} }
public void setTotalPage(String totalPage) { public void setTotalPage(Integer totalPage) {
this.totalPage = totalPage; this.totalPage = totalPage;
} }
public String getTotal() { public Integer getTotal() {
return total; return total;
} }
public void setTotal(String total) { public void setTotal(Integer total) {
this.total = total; this.total = total;
} }
} }

3
tamguo-tms/src/main/java/com/tamguo/web/tiku/PaperController.java
Unescape View File

@ -70,6 +70,9 @@ public class PaperController {
if(!StringUtils.isEmpty(paperType) && !"0".equals(paperType)) { if(!StringUtils.isEmpty(paperType) && !"0".equals(paperType)) {
condition.eq("type", paperType); condition.eq("type", paperType);
} }
if(!StringUtils.isEmpty(courseId) && !"0".equals(courseId)) {
condition.eq("course_id", courseId);
}
if(!StringUtils.isEmpty(year) && !"0".equals(year)) { if(!StringUtils.isEmpty(year) && !"0".equals(year)) {
condition.eq("year", year); condition.eq("year", year);
} }

4
tamguo-tms/src/main/resources/templates/paperlist.html
Unescape View File

@ -165,8 +165,8 @@
<a th:href="${domainName + 'paperlist/' + subjectId + '-' + courseId+'-'+paperType+'-'+year+'-' + area +'-1.html'}">&lt;</a> <a th:href="${domainName + 'paperlist/' + subjectId + '-' + courseId+'-'+paperType+'-'+year+'-' + area +'-1.html'}">&lt;</a>
</li> </li>
<li th:class="${paperPage.currPageNum == num} ? 'selected page-num' : 'page-num'" th:each="num,numStat:${paperPage.pageNums}"> <li th:class="${paperPage.currPageNum + '' == num} ? 'selected page-num' : 'page-num'" th:each="num,numStat:${paperPage.pageNums}">
<a th:href="${domainName + 'paperlist/' + subjectId + '-' + courseId+'-'+paperType+'-'+year+'-' + area +'-'+num+'.html'}" th:text="${num}">1</a> <a th:href="${domainName + 'paperlist/' + subjectId + '-' + courseId+'-'+paperType+'-'+year+'-' + area +'-'+(num=='...' ? 1 : num)+'.html'}" th:text="${num}">1</a>
</li> </li>
<li class="page-num next" th:if="${paperPage.isShowNextBtn}"> <li class="page-num next" th:if="${paperPage.isShowNextBtn}">

Write Preview
Loading…
Cancel
Save