Merge branch 'developer' into 'master'

Developer

See merge request !7

src/main/java/com/gic/plug/web/controller/UploadImgController.java

@@ -149,7 +149,7 @@ public class UploadImgController {
             os.close();
             ins.close();
         } catch (Exception e) {
-            e.printStackTrace();
+            logger.warn("e", e);
         }
     }
 

src/main/java/com/gic/plug/web/controller/goods/GoodsBrandController.java

@@ -38,8 +38,11 @@ public class GoodsBrandController extends BaseGoodsController {
     @Autowired
     private GoodsSelectorApiService goodsSelectorApiService;
 
+    private static final int DEFAULT_PAGE_SIZE = 999;
+
     @RequestMapping("/goods-brand-list")
     public RestResponse goodsBrandList(int pageSize, int currentPage, String search, Long goodsDomainId, String channelCode, Long goodsSelectorId) {
+        pageSize = DEFAULT_PAGE_SIZE;
         String goodsRightsBrands = null;
         if (goodsSelectorId != null) {
             ServiceResponse<GoodsSelectorDTO> selectorServiceResponse = goodsSelectorApiService
@@ -91,6 +94,7 @@ public class GoodsBrandController extends BaseGoodsController {
     }
 
     private RestResponse findBrandListByParams(int currentPage, int pageSize, Long goodsDomainId, String search, Integer enterpriseId) {
+        pageSize = DEFAULT_PAGE_SIZE;
         List<Long> branIdList = new ArrayList<>();
         ServiceResponse<Page<BrandDTO>> serviceResponse = brandApiService.findBrandPage(currentPage, pageSize, goodsDomainId, search, branIdList, SortType.sortDescType, enterpriseId);
         if (!serviceResponse.isSuccess()) {

src/main/java/com/gic/plug/web/controller/goods/GoodsPropertyController.java

@@ -28,8 +28,12 @@ public class GoodsPropertyController extends BaseGoodsController {
     @Autowired
     private PropertyValueApiService propertyValueApiService;
 
+
+    private static final int DEFAULT_PAGE_SIZE = 999;
+
     @RequestMapping("/property-list")
     public RestResponse propertyList(int pageSize, int currentPage, String search, Long goodsDomainId) {
+        pageSize = DEFAULT_PAGE_SIZE;
         List<String> arrayList = new ArrayList<>();
         arrayList.add(Constant.PROPERTY_TYPE_TEXT);
         arrayList.add(Constant.PROPERTY_TYPE_TIME);
@@ -47,6 +51,7 @@ public class GoodsPropertyController extends BaseGoodsController {
 
     @RequestMapping("/property-value-list")
     public RestResponse propertyValueList(int pageSize, int currentPage, String search, Long specPropertyId) {
+        pageSize = DEFAULT_PAGE_SIZE;
         ServiceResponse<Page<PropertyValueDTO>> serviceResponse = propertyValueApiService
                 .pagePropertyValue(currentPage, pageSize, specPropertyId, search, SortType.sortDescType, getEnterpriseId());
         if (!serviceResponse.isSuccess()) {

src/main/java/com/gic/plug/web/controller/goods/GoodsStandardController.java

@@ -30,8 +30,11 @@ public class GoodsStandardController extends BaseGoodsController {
     @Autowired
     private StandardValueGroupApiService standardValueGroupApiService;
 
+    private static final int DEFAULT_PAGE_SIZE = 999;
+
     @RequestMapping("/list-standard")
     public RestResponse listStandard(int currentPage, int pageSize, String search, Long goodsDomainId) {
+        pageSize = DEFAULT_PAGE_SIZE;
         ServiceResponse<Page<StandardDTO>> serviceResponse = standardApiService.listByPage(currentPage, pageSize, goodsDomainId, search, getEnterpriseId());
         if (!serviceResponse.isSuccess()) {
             return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
@@ -43,6 +46,7 @@ public class GoodsStandardController extends BaseGoodsController {
 
     @RequestMapping("/list-standard-value-group")
     public RestResponse listStandardValueGroup(int currentPage, int pageSize, Long specStandardId, String search) {
+        pageSize = DEFAULT_PAGE_SIZE;
         ServiceResponse<Page<StandardValueGroupDTO>> serviceResponse =
                 standardValueGroupApiService.listByPage(currentPage, pageSize, specStandardId, search, SortType.sortDescType, getEnterpriseId());
         if (!serviceResponse.isSuccess()) {
@@ -54,6 +58,7 @@ public class GoodsStandardController extends BaseGoodsController {
 
     @RequestMapping("/list-standard-value")
     public RestResponse listStandardValue(int currentPage, int pageSize, Long specStandardId, String search, Long specStandardValueGroupId) {
+        pageSize = DEFAULT_PAGE_SIZE;
         ServiceResponse<Page<StandardValueDTO>> serviceResponse =
                 standardValueApiService.listByPage(currentPage, pageSize, specStandardId, search, SortType.sortDescType, specStandardValueGroupId, getEnterpriseId());
         if (!serviceResponse.isSuccess()) {

src/main/java/com/gic/plug/web/strategy/impl/StoreCustomBackImpl.java

@@ -16,6 +16,8 @@ import com.gic.store.service.StoreFieldSelectApiService;
 import com.gic.store.utils.StoreRedisKeyUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -31,6 +33,7 @@ import java.util.Map;
 
 @Component
 public class StoreCustomBackImpl implements ScreenBackStrategy {
+    private static Logger log = LogManager.getLogger(StoreCustomBackImpl.class);
     @Autowired
     private StoreFieldApiService storeFieldApiService;
     @Autowired
@@ -85,15 +88,15 @@ public class StoreCustomBackImpl implements ScreenBackStrategy {
                         view.add(message);
                         return screenBack;
                     } catch (IllegalAccessException e) {
-                        e.printStackTrace();
+                        log.warn("e", e);
                     } catch (InvocationTargetException e) {
-                        e.printStackTrace();
+                        log.warn("e", e);
                     }
                 } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
+                    log.warn("e", e);
                 }
             } catch (NoSuchMethodException e) {
-                e.printStackTrace();
+                log.warn("e", e);
             }
         }
         return null;

src/main/java/com/gic/plug/web/strategy/impl/StoreSelectBackImpl.java

@@ -11,6 +11,8 @@ import com.gic.store.constant.StoreStatusEnum;
 import com.gic.store.dto.StoreDictDTO;
 import com.gic.store.service.StoreDictApiService;
 import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -24,6 +26,7 @@ import java.util.Map;
 
 @Component
 public class StoreSelectBackImpl implements ScreenBackStrategy {
+    private static Logger log = LogManager.getLogger(StoreSelectBackImpl.class);
     @Autowired
     private StoreDictApiService storeDictApiService;
     private Map<String, String> methodMap = new HashMap<>();
@@ -48,15 +51,15 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
                         Object invoke = method.invoke(this, compute, value, enterpriseId);
                         return (ScreenBack) invoke;
                     } catch (IllegalAccessException e) {
-                        e.printStackTrace();
+                        log.warn("e", e);
                     } catch (InvocationTargetException e) {
-                        e.printStackTrace();
+                        log.warn("e", e);
                     }
                 } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
+                    log.warn("e", e);
                 }
             } catch (NoSuchMethodException e) {
-                e.printStackTrace();
+                log.warn("e", e);
             }
         }
         return null;
@@ -75,6 +78,7 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
                 }
             }
             screenBack.setView(view);
+            screenBack.setHideView(new ArrayList<>());
             return screenBack;
         }
         return null;
@@ -92,6 +96,7 @@ public class StoreSelectBackImpl implements ScreenBackStrategy {
                 }
             }
             screenBack.setView(view);
+            screenBack.setHideView(new ArrayList<>());
             return screenBack;
         }
         return null;