From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java | 126 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 32 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java
index a85cf19..6ed6023 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java
@@ -9,6 +9,8 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.fanli.entity.SystemEnum;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -54,13 +56,14 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, BrandClass brandClass, PrintWriter out) {
+ public void save(AdminAcceptData acceptData, String callback, BrandClass brandClass, PrintWriter out) {
try {
- brandClassService.saveObject(brandClass);
+ List<SystemEnum> systemList=new ArrayList<>();
+ systemList.add(acceptData.getSystem());
+ brandClassService.saveObject(brandClass,systemList);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (BrandClassException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -74,13 +77,12 @@
* 淇敼鎺掑簭
*
* @param callback
- * @param goodsClass
* @param out
*/
@RequestMapping(value = "updateOrder")
- public void updateOrder(String callback, Long id, Integer moveType, PrintWriter out) {
+ public void updateOrder(AdminAcceptData acceptData,String callback, Long id, Integer moveType, PrintWriter out) {
try {
- brandClassService.updateOrder(id, moveType);
+ brandClassService.updateOrder(id, moveType,acceptData.getSystem());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
} catch (BrandClassException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -101,9 +103,8 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
PrintWriter out) {
-
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
@@ -113,14 +114,13 @@
}
try {
- List<BrandClass> list = brandClassService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);
-
+ List<BrandClass> list = brandClassService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- long count = brandClassService.countQuery(key, state);
+ long count = brandClassService.countQuery(key, state,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -132,11 +132,28 @@
JSONObject data = new JSONObject();
data.put("pe", pe);
data.put("result_list", gson.toJson(list));
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchStateClass")
+ public void switchStateClass(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
+ try {
+ brandClassService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (BrandClassException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
e.printStackTrace();
}
}
@@ -149,8 +166,7 @@
* @param out
*/
@RequestMapping(value = "delete")
- public void delete(String callback, String idArray, PrintWriter out) {
-
+ public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -179,9 +195,9 @@
* @param out
*/
@RequestMapping(value = "getOptions")
- public void getOptions(String callback, PrintWriter out) {
+ public void getOptions(AdminAcceptData acceptData, String callback, PrintWriter out) {
try {
- List<BrandClass> list = brandClassService.listEffective();
+ List<BrandClass> list = brandClassService.listEffective(acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
@@ -217,7 +233,7 @@
* @param out
*/
@RequestMapping(value = "queryTaoBaoShop")
- public void queryTaoBaoShop(String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
+ public void queryTaoBaoShop(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -278,11 +294,10 @@
* 娣诲姞搴楅摵鍏ュ簱
*
* @param callback
- * @param special
* @param out
*/
@RequestMapping(value = "saveShopInfo")
- public void saveShopInfo(String callback, Long cid, String idArray, PrintWriter out) {
+ public void saveShopInfo(AdminAcceptData acceptData,String callback, Long cid, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -317,7 +332,7 @@
* @param out
*/
@RequestMapping(value = "queryClassShop")
- public void queryClassShop(String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
+ public void queryClassShop(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
Integer state, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
@@ -362,11 +377,10 @@
* 淇濆瓨淇℃伅
*
* @param callback
- * @param special
* @param out
*/
@RequestMapping(value = "saveClassShop")
- public void saveClassShop(String callback, Long id, Long cid, String shopName, Integer state, Integer top,
+ public void saveClassShop(AdminAcceptData acceptData,String callback, Long id, Long cid, String shopName, Integer state, Integer top,
String key, HttpServletRequest request, PrintWriter out) {
try {
if (request instanceof MultipartHttpServletRequest) {
@@ -388,11 +402,10 @@
* 淇敼鎺掑簭
*
* @param callback
- * @param goodsClass
* @param out
*/
@RequestMapping(value = "updateOrderClassShop")
- public void updateOrderClassShop(String callback, Long id, Integer moveType, PrintWriter out) {
+ public void updateOrderClassShop(AdminAcceptData acceptData,String callback, Long id, Integer moveType, PrintWriter out) {
try {
brandClassShopService.updateOrder(id, moveType);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
@@ -412,7 +425,7 @@
* @param out
*/
@RequestMapping(value = "deleteClassShop")
- public void deleteClassShop(String callback, String idArray, PrintWriter out) {
+ public void deleteClassShop(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -445,7 +458,7 @@
* @param out
*/
@RequestMapping(value = "saveBrand")
- public void saveBrand(String callback, BrandInfo brandInfo, HttpServletRequest request, PrintWriter out) {
+ public void saveBrand(AdminAcceptData acceptData,String callback, BrandInfo brandInfo, HttpServletRequest request, PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
@@ -465,6 +478,25 @@
/**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchStateBrand")
+ public void switchStateBrand(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
+ try {
+ brandInfoService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (BrandInfoException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
* 鍒犻櫎
*
* @param callback
@@ -472,7 +504,7 @@
* @param out
*/
@RequestMapping(value = "deleteBrand")
- public void deleteBrand(String callback, String idArray, PrintWriter out) {
+ public void deleteBrand(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -495,6 +527,25 @@
}
/**
+ * 淇敼鎺掑簭
+ *
+ * @param callback
+ * @param out
+ */
+ @RequestMapping(value = "updateOrderBrand")
+ public void updateOrderBrand(AdminAcceptData acceptData,String callback, Long id, Integer moveType, PrintWriter out) {
+ try {
+ brandInfoService.updateOrder(id, moveType);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (BrandInfoException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+ /**
* 鍝佺墝淇℃伅鏌ヨ
* @param callback
* @param pageIndex
@@ -505,8 +556,8 @@
* @param out
*/
@RequestMapping(value = "queryBrand")
- public void queryBrand(String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer state,
- PrintWriter out) {
+ public void queryBrand(AdminAcceptData acceptData,String callback, Integer pageIndex, Integer pageSize, String key, Long cid, Integer state,
+ Integer showState, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -516,8 +567,19 @@
pageSize = Constant.PAGE_SIZE;
}
+ List<String> keys = null;
+ if (!StringUtil.isNullOrEmpty(key)) {
+ String[] array = key.split("\\s+");
+ if (array != null && array.length > 0) {
+ keys = new ArrayList<String>();
+ for (int i= 0; i < array.length; i++) {
+ keys.add(array[i].toString());
+ }
+ }
+ }
+
try {
- List<BrandInfo> list = brandInfoService.listQuery((pageIndex - 1) * pageSize, pageSize, key, cid, state);
+ List<BrandInfo> list = brandInfoService.listQuery((pageIndex - 1) * pageSize, pageSize, keys, cid, state, showState);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
@@ -534,7 +596,7 @@
}
}
- long count = brandInfoService.countQuery(key, cid, state);
+ long count = brandInfoService.countQuery(keys, cid, state, showState);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
--
Gitblit v1.8.0