Browse Source

一些格式的封装,

hejq 7 years ago
parent
commit
3e78337f56

+ 1 - 0
pom.xml

@@ -16,6 +16,7 @@
 		<dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
 			<artifactId>spring-webmvc</artifactId>
+			<version>4.3.17.RELEASE</version>
 		</dependency>
 		</dependency>
 		<dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<groupId>org.springframework</groupId>

+ 4 - 2
src/main/java/com/uas/platform/b2b/manage/controller/EnterpriseCotroller.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.manage.controller;
 package com.uas.platform.b2b.manage.controller;
 
 
+import com.uas.platform.b2b.manage.controller.support.PageResultBean;
 import com.uas.platform.b2b.manage.core.support.SystemSession;
 import com.uas.platform.b2b.manage.core.support.SystemSession;
 import com.uas.platform.b2b.manage.model.AccessToken;
 import com.uas.platform.b2b.manage.model.AccessToken;
 import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
 import com.uas.platform.b2b.manage.model.EnterpriseBaseInfo;
@@ -55,7 +56,7 @@ public class EnterpriseCotroller {
      * @return
      * @return
      */
      */
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Page<EnterpriseBaseInfo> findByPageInfo(PageParams params, String keyword, HttpServletRequest request) {
+    public PageResultBean<EnterpriseBaseInfo> findByPageInfo(PageParams params, String keyword, HttpServletRequest request) {
         PageInfo info = new PageInfo(params);
         PageInfo info = new PageInfo(params);
         Sort sort = new Sort(Sort.Direction.DESC, "enDate");
         Sort sort = new Sort(Sort.Direction.DESC, "enDate");
         info.setSort(sort);
         info.setSort(sort);
@@ -63,7 +64,8 @@ public class EnterpriseCotroller {
             keyword = keyword.trim();
             keyword = keyword.trim();
         }
         }
         useLogService.appendLog(UseType.ENGERPRISE_SEARCH.code(), keyword, AgentUtils.getIp(request));
         useLogService.appendLog(UseType.ENGERPRISE_SEARCH.code(), keyword, AgentUtils.getIp(request));
-        return baseInfoService.findEnterPageByKeyword(info, keyword);
+        PageResultBean resultBean = new PageResultBean(baseInfoService.findEnterPageByKeyword(info, keyword));
+        return resultBean;
     }
     }
 
 
     /**
     /**

+ 100 - 0
src/main/java/com/uas/platform/b2b/manage/controller/support/PageResultBean.java

@@ -0,0 +1,100 @@
+package com.uas.platform.b2b.manage.controller.support;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import org.springframework.data.domain.Page;
+
+import java.io.*;
+import java.util.List;
+
+/**
+ * 分页返回结果集
+ *
+ * @author hejq
+ * @date 2018-09-07 11:44
+ */
+@JsonInclude(JsonInclude.Include.NON_EMPTY)
+public class PageResultBean<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 定义返回成功标识
+     */
+    private static final String SUCCESS = "success";
+
+    /**
+     * 成功状态码
+     */
+    private static final int SUCCESS_CODE = 0;
+
+    /**
+     * 失败状态码
+     */
+    public static final int FAIL_CODE = 1;
+
+    /**
+     * 消息
+     */
+    private String msg = SUCCESS;
+
+    /**
+     * 状态码
+     */
+    private int code = SUCCESS_CODE;
+
+    /**
+     * 总页数
+     */
+    private int totalPages;
+
+    /**
+     * 总条数
+     */
+    private long totalElements;
+
+    /**
+     * 页码
+     */
+    private int page;
+
+    /**
+     * 分页大小
+     */
+    private int size;
+
+    /**
+     * 首页
+     */
+    private boolean first;
+
+    /**
+     * 尾页
+     */
+    private boolean last;
+
+    /**
+     * 内容
+     */
+    private List<T> data;
+
+    public PageResultBean() {
+        super();
+    }
+
+    public PageResultBean(Throwable e) {
+        super();
+        this.msg = e.toString();
+        this.code = FAIL_CODE;
+    }
+
+    public PageResultBean(Page<T> data) {
+        super();
+        this.data = data.getContent();
+        this.totalElements = data.getTotalElements();
+        this.totalPages = data.getTotalPages();
+        this.first = data.isFirst();
+        this.last = data.isLast();
+        this.page = data.getNumber();
+        this.size = data.getSize();
+    }
+}

+ 59 - 0
src/main/java/com/uas/platform/b2b/manage/controller/support/ResultBean.java

@@ -0,0 +1,59 @@
+package com.uas.platform.b2b.manage.controller.support;
+
+import java.io.*;
+
+/**
+ * 定义controller返回结果标准
+ *
+ * @author hejq
+ * @date 2018-09-07 11:37
+ */
+public class ResultBean<T> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 定义返回成功标识
+     */
+    private static final String SUCCESS = "success";
+
+    /**
+     * 成功状态码
+     */
+    private static final int SUCCESS_CODE = 0;
+
+    /**
+     * 失败状态码
+     */
+    public static final int FAIL_CODE = 1;
+
+    /**
+     * 消息
+     */
+    private String msg = SUCCESS;
+
+    /**
+     * 状态码
+     */
+    private int code = SUCCESS_CODE;
+
+    /**
+     * 数据
+     */
+    private T data;
+
+    public ResultBean() {
+        super();
+    }
+
+    public ResultBean(T data) {
+        super();
+        this.data = data;
+    }
+
+    public ResultBean(Throwable e) {
+        super();
+        this.msg = e.toString();
+        this.code = FAIL_CODE;
+    }
+}

+ 1 - 1
src/main/webapp/WEB-INF/web.xml

@@ -46,7 +46,7 @@
 		<servlet-name>default</servlet-name>
 		<servlet-name>default</servlet-name>
 		<url-pattern>/WEB-INF/views/*</url-pattern>
 		<url-pattern>/WEB-INF/views/*</url-pattern>
 	</servlet-mapping>
 	</servlet-mapping>
-	
+
 	<!-- Creates the Spring Container shared by all Servlets and Filters -->
 	<!-- Creates the Spring Container shared by all Servlets and Filters -->
 	<listener>
 	<listener>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
 		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>

+ 8 - 2
src/main/webapp/WEB-INF/webmvc.xml

@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+	xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+	http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd
+	http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.1.xsd">
+
+	<!-- 开启@AspectJ AOP代理 -->
+	<aop:aspectj-autoproxy />
 
 
 	<mvc:annotation-driven>
 	<mvc:annotation-driven>
 		<mvc:message-converters register-defaults="true">
 		<mvc:message-converters register-defaults="true">