签名方式修改

eccs-biz/src/main/java/com/emato/biz/controller/mall/SalesDetailController.java

@@ -6,6 +6,7 @@ import com.emato.biz.domain.mall.NewSystemFormatEntiy;
 import com.emato.biz.service.mall.ISalesDetaiServicel;
 import com.emato.common.annotation.AnonymousAccess;
 import com.emato.common.core.Result;
+import com.emato.common.core.ResultNew;
 import org.apache.http.Header;
 import org.apache.http.HttpRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -32,9 +33,9 @@ public class SalesDetailController {
      */
     @AnonymousAccess
     @PostMapping("/eccspushsales")
-    public Result pushSalesDetailServicel(@RequestBody NewSystemFormatEntiy newSystemFormatEntiy)
+    public ResultNew pushSalesDetailServicel(@RequestBody NewSystemFormatEntiy newSystemFormatEntiy)
     {
-        return Result.success(salesDetaiServicel.pushSalesDetaiServicel(newSystemFormatEntiy));
+        return ResultNew.success(salesDetaiServicel.pushSalesDetaiServicel(newSystemFormatEntiy));
     }
 
     /**

eccs-biz/src/main/java/com/emato/biz/service/impl/SalesDetaiServicelImpl.java

@@ -92,7 +92,10 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
                 if(list.size()==0){
                     return Result.error("1004","该条件下无数据");
                 }else{
-                    return Result.success(list);
+                    Map<String,Object> map = new HashMap<>();
+                    map.put("total",list.size());
+                    map.put("rows",list);
+                    return Result.success(map);
                 }
             }else{
                 return Result.error("1005","请求总数或时间区间过大");
@@ -179,7 +182,10 @@ public class SalesDetaiServicelImpl implements ISalesDetaiServicel {
             if(list.size()==0){
                 return Result.error("1002","该条件下无数据");
             }else{
-                return Result.success(list);
+                Map<String,Object> map = new HashMap<>();
+                map.put("total",list.size());
+                map.put("rows",list);
+                return Result.success(map);
             }
         }catch (Exception e){
             logger.error("外部系统查询库存系统条件="+JSON.toJSONString(msg),e);

eccs-common/src/main/java/com/emato/common/core/Result.java

@@ -1,6 +1,7 @@
 package com.emato.common.core;
 
 import java.io.Serializable;
+import java.util.Map;
 
 public class Result implements Serializable {
 
@@ -10,7 +11,7 @@ public class Result implements Serializable {
 
     private String status;
 
-    private Object data;
+    private Map<String,Object> data;
 
     //private String totalRecord;
 
@@ -35,7 +36,7 @@ public class Result implements Serializable {
 //        return result;
 //    }
 
-    public static Result success(Object data) {
+    public static Result success(Map<String,Object> data) {
         Result result = new Result();
         result.code = "200";
         result.msg = "请求成功";
@@ -49,7 +50,7 @@ public class Result implements Serializable {
         result.code = code;
         result.status = "false";
         result.msg = msg;
-        result.data = "";
+        result.data = null;
         return result;
     }
 
@@ -85,11 +86,11 @@ public class Result implements Serializable {
         this.msg = msg;
     }
 
-    public Object getData() {
+    public Map<String, Object> getData() {
         return data;
     }
 
-    public void setData(Object data) {
+    public void setData(Map<String, Object> data) {
         this.data = data;
     }
 }

eccs-common/src/main/java/com/emato/common/core/ResultNew.java

@@ -25,15 +25,6 @@ public class ResultNew implements Serializable {
         return result;
     }
 
-//    public static Result success(Object data,String totalRecord) {
-//        Result result = new Result();
-//        result.code = "200";
-//        result.msg = "请求成功";
-//        result.status = "true";
-//        result.totalRecord = totalRecord;
-//        result.data = data;
-//        return result;
-//    }
 
     public static ResultNew success(Object data) {
         ResultNew result = new ResultNew();