统一返回整合

src/main/java/com/caimei/www/controller/HomeController.java

@@ -1,7 +1,10 @@
 package com.caimei.www.controller;
 
-import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.www.pojo.ImageLink;
+import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.HomeFloor;
+import com.caimei.www.pojo.base.HeadCart;
+import com.caimei.www.pojo.product.ProductList;
 import com.caimei.www.service.HomeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -10,6 +13,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Description
@@ -47,7 +51,7 @@ public class HomeController extends BaseController {
      */
     @GetMapping("/home/banner")
     @ResponseBody
-    public JsonModel getHomeBanners() {
+    public JsonModel<List<ImageLink>> getHomeBanners() {
         return homeService.getHomeBanners();
     }
 
@@ -57,7 +61,7 @@ public class HomeController extends BaseController {
      */
     @GetMapping("/home/advertising")
     @ResponseBody
-    public JsonModel getAdvertising() {
+    public JsonModel<List<ImageLink>> getAdvertising() {
         return homeService.getAdvertising();
     }
 
@@ -67,7 +71,7 @@ public class HomeController extends BaseController {
      */
     @GetMapping("/home/recommend")
     @ResponseBody
-    public JsonModel getRecommendProducts() {
+    public JsonModel<List<ProductList>> getRecommendProducts() {
         return homeService.getRecommendProducts();
     }
 
@@ -77,7 +81,7 @@ public class HomeController extends BaseController {
      */
     @GetMapping("/home/topic")
     @ResponseBody
-    public JsonModel getHomeTopicData() {
+    public JsonModel<Map<String, Object>> getHomeTopicData() {
         return homeService.getHomeTopicData();
     }
 
@@ -87,7 +91,7 @@ public class HomeController extends BaseController {
      */
     @GetMapping("/header/cart")
     @ResponseBody
-    public JsonModel getHeadCarts(Integer userId) {
+    public JsonModel<List<HeadCart>> getHeadCarts(Integer userId) {
         return homeService.getHeaderCart(userId);
     }
 

src/main/java/com/caimei/www/controller/ProductController.java

@@ -1,7 +1,8 @@
 package com.caimei.www.controller;
 
-import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.product.ProductDetail;
+import com.caimei.www.pojo.product.ProductList;
 import com.caimei.www.pojo.product.ProductParameter;
 import com.caimei.www.service.ProductService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +12,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import java.util.List;
+
 /**
  *cription
  *
@@ -63,7 +66,7 @@ public class ProductController extends BaseController {
      */
     @GetMapping("/product/images")
     @ResponseBody
-    public JsonModel getProductDetailImages(Integer productId) {
+    public JsonModel<List<String>> getProductDetailImages(Integer productId) {
         return productService.getProductDetailImages(productId);
     }
 
@@ -74,7 +77,7 @@ public class ProductController extends BaseController {
      */
     @GetMapping("/product/recommend")
     @ResponseBody
-    public JsonModel getProductDetailRecommends(Integer productId, Integer recommendType) {
+    public JsonModel<List<ProductList>> getProductDetailRecommends(Integer productId, Integer recommendType) {
         return productService.getProductDetailRecommends(productId, recommendType);
     }
 
@@ -84,7 +87,7 @@ public class ProductController extends BaseController {
      */
     @GetMapping("/product/parameter")
     @ResponseBody
-    public JsonModel getProductParameters(Integer productId) {
+    public JsonModel<List<ProductParameter>> getProductParameters(Integer productId) {
         return productService.getProductParameters(productId);
     }
 

src/main/java/com/caimei/www/pojo/JsonModel.java

@@ -0,0 +1,72 @@
+package com.caimei.www.pojo;
+
+import lombok.Data;
+import java.io.Serializable;
+
+/**
+ * Description
+ *
+ * @author : Charles
+ * @date : 2020/7/14
+ */
+@Data
+public class JsonModel<T> implements Serializable {
+    /** 状态码 */
+    private int code;
+    /** 提示信息 */
+    private String msg;
+    /** 返回的数据 */
+    private T data;
+
+    private JsonModel() {}
+
+    private JsonModel(int code, String msg) {
+        this.code = code;
+        this.msg = msg;
+    }
+
+    private JsonModel(int code, String msg, T data) {
+        this.code = code;
+        this.msg = msg;
+        this.data = data;
+    }
+
+    public static JsonModel success() {
+        return new JsonModel<>(0, "操作成功");
+    }
+
+    public static<T> JsonModel<T> success(T data) {
+        return new JsonModel<>(0, "操作成功", data);
+    }
+
+    public static<T> JsonModel<T> success(String msg, T data) {
+        return new JsonModel<>(0, msg, data);
+    }
+
+    public static<T> JsonModel<T> success(int code, String msg, T data) {
+        return new JsonModel<>(code, msg, data);
+    }
+
+    public static JsonModel error() {
+        return new JsonModel<>(-1, "操作失败");
+    }
+
+    public static JsonModel error(String msg) {
+        return new JsonModel<>(-1, msg);
+    }
+
+    public static JsonModel error(int code, String msg) {
+        return new JsonModel<>(code, msg);
+    }
+
+    public static<T> JsonModel<T> error(int code, String msg, T data) {
+        return new JsonModel<>(code, msg, data);
+    }
+
+    @Override
+    public String toString() {
+        return "JsonModel{" + "code=" + code + ", msg='" + msg + '\'' + ", data=" + data + '}';
+    }
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/caimei/www/service/BaseService.java

@@ -1,6 +1,6 @@
 package com.caimei.www.service;
 
-import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.base.FriendLink;
 import com.caimei.www.pojo.base.HelpPageType;
 import com.caimei.www.pojo.base.TopMenu;

src/main/java/com/caimei/www/service/HomeService.java

@@ -1,9 +1,13 @@
 package com.caimei.www.service;
 
-import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.www.pojo.ImageLink;
+import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.HomeFloor;
+import com.caimei.www.pojo.base.HeadCart;
+import com.caimei.www.pojo.product.ProductList;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 首页服务
@@ -20,26 +24,26 @@ public interface HomeService {
     /**
      * 首页轮播图
      */
-    JsonModel getHomeBanners();
+    JsonModel<List<ImageLink>> getHomeBanners();
 
     /**
      * 首页左侧广告图
      */
-    JsonModel getAdvertising();
+    JsonModel<List<ImageLink>> getAdvertising();
 
     /**
      * 首页推荐专区
      */
-    JsonModel getRecommendProducts();
+    JsonModel<List<ProductList>> getRecommendProducts();
 
     /**
      * 首页专题数据
      */
-    JsonModel getHomeTopicData();
+    JsonModel<Map<String, Object>> getHomeTopicData();
 
     /**
      * 顶部购物车数据
      * @return
      */
-    JsonModel getHeaderCart(Integer userId);
+    JsonModel<List<HeadCart>> getHeaderCart(Integer userId);
 }

src/main/java/com/caimei/www/service/ProductService.java

@@ -1,7 +1,11 @@
 package com.caimei.www.service;
 
-import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.product.ProductDetail;
+import com.caimei.www.pojo.product.ProductList;
+import com.caimei.www.pojo.product.ProductParameter;
+
+import java.util.List;
 
 /**
  * Description
@@ -23,19 +27,19 @@ public interface ProductService {
      * @param recommendType
      * @return
      */
-    JsonModel getProductDetailRecommends(Integer productId, Integer recommendType);
+    JsonModel<List<ProductList>> getProductDetailRecommends(Integer productId, Integer recommendType);
 
     /**
      * 详情-相关参数
      * @param productId
      * @return
      */
-    JsonModel getProductParameters(Integer productId);
+    JsonModel<List<ProductParameter>> getProductParameters(Integer productId);
 
     /**
      * 详情-图片
      * @param productId
      * @return
      */
-    JsonModel getProductDetailImages(Integer productId);
+    JsonModel<List<String>> getProductDetailImages(Integer productId);
 }

src/main/java/com/caimei/www/service/impl/BaseServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei.www.service.impl;
 
-import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.mapper.BaseDao;
 import com.caimei.www.pojo.base.*;
 import com.caimei.www.service.BaseService;

src/main/java/com/caimei/www/service/impl/HomeServiceImpl.java

@@ -1,6 +1,6 @@
 package com.caimei.www.service.impl;
 
-import com.caimei.module.base.entity.bo.JsonModel;
+import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.mapper.HomeDao;
 import com.caimei.www.pojo.HomeFloor;
 import com.caimei.www.pojo.ImageLink;
@@ -44,9 +44,9 @@ public class HomeServiceImpl implements HomeService {
      */
     @Override
     @Cacheable(value = "getHomeBanners", key="'www'", unless="#result == null")
-    public JsonModel getHomeBanners() {
+    public JsonModel<List<ImageLink>> getHomeBanners() {
         List<ImageLink> list = homeDao.getHomeBanners();
-        return JsonModel.newInstance().success(list);
+        return JsonModel.success(list);
     }
 
     /**
@@ -54,9 +54,9 @@ public class HomeServiceImpl implements HomeService {
      */
     @Override
     @Cacheable(value = "getAdvertising", key="'www'", unless="#result == null")
-    public JsonModel getAdvertising() {
+    public JsonModel<List<ImageLink>> getAdvertising() {
         List<ImageLink> list = homeDao.getAdvertising();
-        return JsonModel.newInstance().success(list);
+        return JsonModel.success(list);
     }
 
     /**
@@ -64,7 +64,7 @@ public class HomeServiceImpl implements HomeService {
      */
     @Override
     @Cacheable(value = "getRecommendProducts", key="'www'", unless="#result == null")
-    public JsonModel getRecommendProducts() {
+    public JsonModel<List<ProductList>> getRecommendProducts() {
         List<ProductList> list = homeDao.getRecommendeds();
         if (list.size() > 0) {
             // 设置价格等级 及 老图片路径
@@ -75,14 +75,14 @@ public class HomeServiceImpl implements HomeService {
 
             });
         }
-        return JsonModel.newInstance().success(list);
+        return JsonModel.success(list);
     }
 
     /**
      * 首页专题数据
      */
     @Override
-    public JsonModel getHomeTopicData() {
+    public JsonModel<Map<String, Object>> getHomeTopicData() {
         // 大专题:6,小专题:5,商品专题:4,优质供应商:3
         Map<String, Object> topicMap = new HashMap<>();
         // 6大专题二级楼层
@@ -102,15 +102,15 @@ public class HomeServiceImpl implements HomeService {
         List<ImageLink>  topicData3 = homeDao.getSuppliersTopData();
         topicMap.put("topicData3", topicData3);
 
-        return JsonModel.newInstance().success(topicMap);
+        return JsonModel.success(topicMap);
     }
 
     /**
      * 顶部购物车数据
      */
     @Override
-    public JsonModel getHeaderCart(Integer userId) {
+    public JsonModel<List<HeadCart>> getHeaderCart(Integer userId) {
         List<HeadCart> headCarts = homeDao.getHeadCarts(userId);
-        return JsonModel.newInstance().success(headCarts);
+        return JsonModel.success(headCarts);
     }
 }

src/main/java/com/caimei/www/service/impl/ProductServiceImpl.java

@@ -1,15 +1,12 @@
 package com.caimei.www.service.impl;
 
-import com.caimei.module.base.entity.bo.JsonModel;
-import com.caimei.module.base.entity.po.Product;
+import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.mapper.ProductDao;
-import com.caimei.www.pojo.ImageLink;
 import com.caimei.www.pojo.product.ProductDetail;
 import com.caimei.www.pojo.product.ProductList;
 import com.caimei.www.pojo.product.ProductParameter;
 import com.caimei.www.service.ProductService;
 import com.caimei.www.utils.ImageUtil;
-import com.caimei.www.utils.PriceUtil;
 import io.netty.util.internal.StringUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -62,7 +59,7 @@ public class ProductServiceImpl implements ProductService {
      * @return
      */
     @Override
-    public JsonModel getProductDetailRecommends(Integer productId, Integer recommendType) {
+    public JsonModel<List<ProductList>> getProductDetailRecommends(Integer productId, Integer recommendType) {
         List<ProductList> list = null;
         //相关推荐类型 0自动选择; 1手动推荐
         if (1 == recommendType) {
@@ -70,7 +67,7 @@ public class ProductServiceImpl implements ProductService {
         } else {
             list = productDao.getAutoProductRecommends(productId);
         }
-		return JsonModel.newInstance().success(list);
+		return JsonModel.success(list);
     }
 
     /**
@@ -80,9 +77,9 @@ public class ProductServiceImpl implements ProductService {
      * @return
      */
     @Override
-    public JsonModel getProductParameters(Integer productId) {
+    public JsonModel<List<ProductParameter>> getProductParameters(Integer productId) {
         List<ProductParameter> list = productDao.getProductParameters(productId);
-		return JsonModel.newInstance().success(list);
+		return JsonModel.success(list);
     }
 
     /**
@@ -92,7 +89,7 @@ public class ProductServiceImpl implements ProductService {
      * @return
      */
     @Override
-    public JsonModel getProductDetailImages(Integer productId) {
+    public JsonModel<List<String>> getProductDetailImages(Integer productId) {
         List<String> list = productDao.getProductDetailImages(productId);
         if (list.size() > 0) {
             // 设置价格等级 及 老图片路径
@@ -100,6 +97,6 @@ public class ProductServiceImpl implements ProductService {
                 image = ImageUtil.getImageURL("product", image, 0, domain);
             });
         }
-		return JsonModel.newInstance().success(list);
+		return JsonModel.success(list);
     }
 }

src/main/resources/config/dev/application-dev.yml

@@ -45,8 +45,7 @@ spring:
 logging:
   level:
     root: info
-#    com.caimei.mapper: debug
-#    com.caimei.module.product.dao: debug
+    com.caimei.www.mapper: debug
 
 
 # 服务域名