代码结构调整

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

@@ -67,7 +67,7 @@ public class BaseController {
 		return model;
 	}
 
-	String getErrorPath(){
+	protected String getErrorPath(){
 		return ERROR_PATH;
 	}
 }

src/main/java/com/caimei/www/controller/ShoppingCartController.java → src/main/java/com/caimei/www/controller/authorized/ShoppingCartController.java

@@ -1,5 +1,6 @@
-package com.caimei.www.controller;
+package com.caimei.www.controller.authorized;
 
+import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.base.ShoppingCart;
 import com.caimei.www.service.ShoppingCartService;

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

@@ -1,5 +1,6 @@
-package com.caimei.www.controller;
+package com.caimei.www.controller.unlimited;
 
+import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.content.ImageLink;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.content.PageFloor;

src/main/java/com/caimei/www/controller/InstrumentController.java → src/main/java/com/caimei/www/controller/unlimited/InstrumentController.java

@@ -1,5 +1,6 @@
-package com.caimei.www.controller;
+package com.caimei.www.controller.unlimited;
 
+import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.content.PageContent;
 import com.caimei.www.pojo.content.PageFloor;

src/main/java/com/caimei/www/controller/MaintenanceController.java → src/main/java/com/caimei/www/controller/unlimited/MaintenanceController.java

@@ -1,5 +1,6 @@
-package com.caimei.www.controller;
+package com.caimei.www.controller.unlimited;
 
+import com.caimei.www.controller.BaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;

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

@@ -1,5 +1,6 @@
-package com.caimei.www.controller;
+package com.caimei.www.controller.unlimited;
 
+import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.content.ProductDetail;
 import com.caimei.www.pojo.content.ProductList;

src/main/java/com/caimei/www/controller/SinglePageController.java → src/main/java/com/caimei/www/controller/unlimited/SinglePageController.java

@@ -1,5 +1,6 @@
-package com.caimei.www.controller;
+package com.caimei.www.controller.unlimited;
 
+import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.content.ImageLink;
 import com.caimei.www.pojo.content.PageContent;

src/main/java/com/caimei/www/controller/SupplierController.java → src/main/java/com/caimei/www/controller/unlimited/SupplierController.java

@@ -1,5 +1,6 @@
-package com.caimei.www.controller;
+package com.caimei.www.controller.unlimited;
 
+import com.caimei.www.controller.BaseController;
 import com.caimei.www.pojo.JsonModel;
 import com.caimei.www.pojo.content.ProductList;
 import com.caimei.www.pojo.content.SupplierDetail;

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

@@ -59,6 +59,14 @@ public class JsonModel<T> implements Serializable {
         return new JsonModel<>(code, msg);
     }
 
+    public static<T> JsonModel<T> error(T data) {
+        return new JsonModel<>(-1, "操作失败", data);
+    }
+
+    public static<T> JsonModel<T> error(String msg, T data) {
+        return new JsonModel<>(-1, msg, data);
+    }
+
     public static<T> JsonModel<T> error(int code, String msg, T data) {
         return new JsonModel<>(code, msg, data);
     }

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

@@ -54,6 +54,7 @@ public class InstrumentServiceImpl implements InstrumentService {
      */
     @Override
     public JsonModel<List<PageFloor>> getInstrumentRecommendById(Integer instrumentId) {
+        if (instrumentId == null) { return JsonModel.error("参数异常", null);}
         List<PageFloor> floorList = singlePageDao.getFloorByPageId(instrumentId);
         if (floorList.size() > 0) {
             List<PageFloor> tempList = new ArrayList<>();

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

@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -78,6 +79,7 @@ public class ProductServiceImpl implements ProductService {
      */
     @Override
     public JsonModel<List<Parameter>> getProductParameters(Integer productId) {
+        if (productId == null) { return JsonModel.error("参数异常", null);}
         List<Parameter> list = productDao.getProductParameters(productId);
 		return JsonModel.success(list);
     }
@@ -90,6 +92,7 @@ public class ProductServiceImpl implements ProductService {
      */
     @Override
     public JsonModel<List<String>> getProductDetailImages(Integer productId) {
+        if (productId == null) { return JsonModel.error("参数异常", null);}
         List<String> list = productDao.getProductDetailImages(productId);
         if (list.size() > 0) {
             // 设置价格等级 及 老图片路径

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

@@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -31,6 +32,7 @@ public class ShoppingCartServiceImpl implements ShoppingCartService {
      */
     @Override
     public JsonModel<List<ShoppingCart>> getHeaderCart(Integer userId) {
+        if (userId == null || userId == 0) { return JsonModel.error("参数异常", null);}
         List<ShoppingCart> headCarts = shoppingCartDao.getHeadCarts(userId);
         return JsonModel.success(headCarts);
     }

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

@@ -22,6 +22,7 @@ import javax.annotation.Resource;
 import java.io.*;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -45,6 +46,7 @@ public class SinglePageServiceImpl implements SinglePageService {
      */
     @Override
     public PageContent getFreePageById(Integer id) {
+        if (id == null) { return null;}
         return singlePageDao.getFreePageById(id);
     }
 
@@ -55,6 +57,7 @@ public class SinglePageServiceImpl implements SinglePageService {
      */
     @Override
     public PageContent getTopicPageById(Integer id) {
+        if (id == null) { return null;}
         return singlePageDao.getTopicPageById(id);
     }
 
@@ -73,6 +76,7 @@ public class SinglePageServiceImpl implements SinglePageService {
      */
     @Override
     public JsonModel<List<PageFloor>> getTopicDataById(Integer id) {
+        if (id == null) { return JsonModel.error("参数异常", null);}
         List<PageFloor> pageFloors = singlePageDao.getFloorByPageId(id);
         if (!CollectionUtils.isEmpty(pageFloors)) {
             pageFloors.forEach(floor -> {

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -48,6 +49,7 @@ public class SupplierServiceImpl implements SupplierService {
      */
     @Override
     public JsonModel<List<String>> getSupplierDetailImages(Integer supplierId) {
+        if (supplierId == null) { return JsonModel.error("参数异常", null);}
         List<String> images = supplierDao.getSupplierDetailImages(supplierId);
         return JsonModel.success(images);
     }
@@ -60,6 +62,7 @@ public class SupplierServiceImpl implements SupplierService {
      */
     @Override
     public JsonModel<List<ProductList>> getSupplierMainProducts(Integer supplierId) {
+        if (supplierId == null) { return JsonModel.error("参数异常", null);}
         List<ProductList> list = supplierDao.getSupplierMainProducts(supplierId);
         // 设置价格等级 及 老图片路径
         list.forEach(product -> {