分页查询任务免登录接口

xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java

@@ -1,6 +1,8 @@
 package com.xm.core.ctrl;
 
 import com.alibaba.fastjson.JSON;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageSerializable;
 import com.mdp.audit.log.client.annotation.AuditLog;
 import com.mdp.audit.log.client.annotation.OperType;
 import com.mdp.core.entity.Tips;
@@ -187,17 +189,23 @@ public class XmTaskController {
 		if(!StringUtils.hasText(isDefault)){
 			tips.setFailureMsg("isDefault-not-set","isDefault","isDefault参数必传，默认查询isDefault=1,非默认查询isDefault=0");
 		}else if("1".equals(isDefault)){
-			xmTaskVoList=xmTaskCacheService.getTasks(queryKeys);
-			if(xmTaskVoList==null){
+			PageSerializable<Map<String,Object>> tasks =xmTaskCacheService.getTasks(queryKeys);
+			if(tasks==null){
 				xmTaskVoList = xmTaskService.getTask(xmTask);	//列出XmTask列表
+				tasks=new PageSerializable<>(xmTaskVoList);
+				xmTaskCacheService.putTasks(queryKeys,tasks);
 				PageUtils.responePage(m,xmTaskVoList);
-				xmTaskCacheService.putTasks(queryKeys,xmTaskVoList);
+			}else{
+				xmTaskVoList=tasks.getList();
+				m.put("total",tasks.getTotal());
 			}
 		}else {
 			xmTaskVoList = xmTaskService.getTask(xmTask);	//列出XmTask列表
 			PageUtils.responePage(m,xmTaskVoList);
 		}
 
+
+
 		m.put("data",xmTaskVoList);
 		m.put("tips", tips);
 		return m;

xm-core/src/main/java/com/xm/core/service/cache/XmTaskCacheService.java

@@ -1,5 +1,6 @@
 package com.xm.core.service.cache;
 
+import com.github.pagehelper.PageSerializable;
 import com.xm.core.entity.XmProject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -18,17 +19,17 @@ public class XmTaskCacheService {
 	String getCacheKey() {
  		return "xm_task";
 	} 
-	public void putTasks(String queryKeys, List<Map<String,Object>> tasks){
+	public void putTasks(String queryKeys, PageSerializable<Map<String,Object>> tasks){
 		String key=this.getCacheKey()+"_"+queryKeys;
 		String hashKey=key;
 		redisTemplate.opsForHash().put(key, hashKey, tasks);
 		redisTemplate.expire(hashKey, 24, TimeUnit.HOURS);
 	}
 	
-	public  List<Map<String,Object>>  getTasks(String queryKeys){
+	public PageSerializable<Map<String,Object>> getTasks(String queryKeys){
 		String key=this.getCacheKey()+"_"+queryKeys;
 		String hashKey=key;
-		return (List<Map<String,Object>>) redisTemplate.opsForHash().get(key, hashKey);
+		return (PageSerializable<Map<String,Object>>) redisTemplate.opsForHash().get(key, hashKey);
 		
 	}
 	

xm-core/src/main/webapp/META-INF/MANIFEST.MF

@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: 
-

xm-core/src/main/webapp/WEB-INF/web.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" id="WebApp_ID" version="3.1">
-  <display-name>mdp-wxpub-web</display-name>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-    <welcome-file>default.html</welcome-file>
-    <welcome-file>default.htm</welcome-file>
-    <welcome-file>default.jsp</welcome-file>
-  </welcome-file-list>
-</web-app>

xm-core/src/test/java/com/xm/core/ctrl/TestXmTaskController.java

@@ -80,7 +80,26 @@ public class TestXmTaskController {
 			.andExpect(status().isOk())
 		   	.andExpect(jsonPath("tips.isOk").value(true));
 	}
-
+	@Test
+	public void getOutTask() throws Exception  {
+		mockMvc.perform( get("/**/xm/core/xmTask/getOutTask")
+				.param("pageNum", "1").param("pageSize", "10").param("isDefault","1"))
+				.andDo(print())
+				.andExpect(status().isOk())
+				.andExpect(jsonPath("tips.isOk").value(true))
+				.andExpect(jsonPath("data").isArray())
+				.andExpect(jsonPath("total").exists());
+	}
+	@Test
+	public void getOutTask2() throws Exception  {
+		mockMvc.perform( get("/**/xm/core/xmTask/getOutTask")
+				.param("pageNum", "2").param("pageSize", "10").param("isDefault","1"))
+				.andDo(print())
+				.andExpect(status().isOk())
+				.andExpect(jsonPath("tips.isOk").value(true))
+				.andExpect(jsonPath("data").isArray())
+				.andExpect(jsonPath("total").exists());
+	}
 	@Test
 	public void list() throws Exception  {
 		mockMvc.perform( get("/**/core/xmTask/list")