From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
java110-bean/src/main/java/com/java110/vo/ResultVo.java | 153 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 149 insertions(+), 4 deletions(-)
diff --git a/java110-bean/src/main/java/com/java110/vo/ResultVo.java b/java110-bean/src/main/java/com/java110/vo/ResultVo.java
old mode 100644
new mode 100755
index d18a30a..b47fdb7
--- a/java110-bean/src/main/java/com/java110/vo/ResultVo.java
+++ b/java110-bean/src/main/java/com/java110/vo/ResultVo.java
@@ -1,6 +1,9 @@
package com.java110.vo;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import org.slf4j.Logger;
+
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -17,6 +20,8 @@
**/
public class ResultVo implements Serializable {
+
+
public static final int CODE_ERROR = 404;// 鏈煡寮傚父
public static final int CODE_OK = 0; // 鎴愬姛
@@ -27,6 +32,7 @@
public static final int CODE_UNAUTHORIZED = 401; //璁よ瘉澶辫触
public static final int CODE_WECHAT_UNAUTHORIZED = 1401; //璁よ瘉澶辫触
+ public static final int CODE_BUSINESS_VERIFICATION = 5010; //涓氬姟鏍￠獙鏈�氳繃
public static final int ORDER_ERROR = 500; //璁㈠崟璋冨害寮傚父
@@ -40,6 +46,10 @@
public static final int DEFAULT_RECORD = 1;
public static final int DEFAULT_TOTAL = 1;
+ public static final int CODE_WAIT_PAY = 41;// 鏀粯鏈畬鎴�
+
+ public static final String EMPTY_ARRAY = "[]";
+
// 鍒嗛〉椤垫暟
private int page;
// 琛屾暟
@@ -49,9 +59,9 @@
private int records;
// 鎬昏褰曟暟
- private int total;
+ private long total;
- //鐘舵�佸槢
+ //鐘舵��
private int code;
//閿欒鎻愮ず
@@ -59,6 +69,12 @@
//鏁版嵁瀵硅薄
private Object data;
+
+ //鐢ㄦ潵瀛樻斁澶ц銆佸皬璁￠噾棰�
+ private Object sumTotal;
+
+ //鎵�闇�鏁版嵁
+ private Object rep;
public ResultVo() {
}
@@ -80,6 +96,33 @@
this.records = records;
this.total = total;
this.data = data;
+ }
+
+ public ResultVo(int records, long total, Object data) {
+ this.code = CODE_OK;
+ this.msg = MSG_OK;
+ this.records = records;
+ this.total = total;
+ this.data = data;
+ }
+
+ public ResultVo(int records, int total, Object data, Object sumTotal) {
+ this.code = CODE_OK;
+ this.msg = MSG_OK;
+ this.records = records;
+ this.total = total;
+ this.data = data;
+ this.sumTotal = sumTotal;
+ }
+
+ public ResultVo(int records, int total, Object data, Object sumTotal, Object rep) {
+ this.code = CODE_OK;
+ this.msg = MSG_OK;
+ this.records = records;
+ this.total = total;
+ this.data = data;
+ this.sumTotal = sumTotal;
+ this.rep = rep;
}
public ResultVo(int code, String msg, Object data) {
@@ -120,7 +163,7 @@
this.records = records;
}
- public int getTotal() {
+ public long getTotal() {
return total;
}
@@ -152,9 +195,25 @@
this.data = data;
}
+ public Object getSumTotal() {
+ return sumTotal;
+ }
+
+ public void setSumTotal(Object sumTotal) {
+ this.sumTotal = sumTotal;
+ }
+
+ public Object getRep() {
+ return rep;
+ }
+
+ public void setRep(Object rep) {
+ this.rep = rep;
+ }
+
@Override
public String toString() {
- return JSONObject.toJSONString(this);
+ return JSONObject.toJSONString(this, SerializerFeature.DisableCircularReferenceDetect, SerializerFeature.WriteDateUseDateFormat);
}
@@ -166,6 +225,61 @@
*/
public static ResponseEntity<String> createResponseEntity(Object data) {
ResultVo resultVo = new ResultVo(DEFAULT_RECORD, DEFAULT_TOTAL, data);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ return responseEntity;
+ }
+
+ /**
+ * 鍒涘缓ResponseEntity瀵硅薄
+ *
+ * @param resultVo 鏁版嵁瀵硅薄
+ * @return
+ */
+ public static ResponseEntity<String> createResponseEntity(ResultVo resultVo) {
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ return responseEntity;
+ }
+
+ /**
+ * 鎴愬姛閫氱敤鍥炲
+ *
+ * @return
+ */
+ public static ResponseEntity<String> success() {
+ ResultVo resultVo = new ResultVo(CODE_OK, MSG_OK);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ return responseEntity;
+ }
+
+ /**
+ * 鎴愬姛閫氱敤鍥炲
+ *
+ * @return
+ */
+ public static ResponseEntity<String> error(String msg,HttpStatus status) {
+ ResultVo resultVo = new ResultVo(CODE_ERROR, msg);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), status);
+ return responseEntity;
+ }
+
+ /**
+ * 鎴愬姛閫氱敤鍥炲
+ *
+ * @return
+ */
+ public static ResponseEntity<String> error(String msg) {
+ ResultVo resultVo = new ResultVo(CODE_ERROR, msg);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ return responseEntity;
+ }
+
+ /**
+ * 鎴愬姛閫氱敤鍥炲
+ *
+ * @return
+ */
+ public static ResponseEntity<String> error(String msg,Object data) {
+ ResultVo resultVo = new ResultVo(CODE_ERROR, msg,data);
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
return responseEntity;
}
@@ -185,12 +299,28 @@
}
/**
+ * 鍒涘缓ResponseEntity瀵硅薄
+ *
+ * @param records
+ * @param total
+ * @param data
+ * @param sumTotal
+ * @return
+ */
+ public static ResponseEntity<String> createResponseEntity(int records, int total, Object data, Object sumTotal) {
+ ResultVo resultVo = new ResultVo(records, total, data, sumTotal);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ return responseEntity;
+ }
+
+ /**
* 椤甸潰璺宠浆
*
* @param url
* @return
*/
public static ResponseEntity<String> redirectPage(String url) {
+
HttpHeaders headers = new HttpHeaders();
headers.add(HttpHeaders.LOCATION, url);
ResponseEntity<String> responseEntity = new ResponseEntity<String>("", headers, HttpStatus.FOUND);
@@ -214,6 +344,19 @@
/**
* 鍒涘缓ResponseEntity瀵硅薄
*
+ * @param code 鐘舵�佸槢
+ * @param msg 杩斿洖淇℃伅
+ * @return
+ */
+ public static ResponseEntity<String> createResponseEntity(int code, String msg) {
+ ResultVo resultVo = new ResultVo(code, msg);
+ ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+ return responseEntity;
+ }
+
+ /**
+ * 鍒涘缓ResponseEntity瀵硅薄
+ *
* @param records 椤垫暟
* @param total 鎬昏褰曟暟
* @param code 鐘舵�佸槢
@@ -226,4 +369,6 @@
ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
return responseEntity;
}
+
+
}
--
Gitblit v1.8.0