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/GoodsClassAdminCotroller.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
index bee6b70..f2ddc4b 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/GoodsClassAdminCotroller.java
@@ -7,6 +7,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+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;
@@ -16,7 +17,6 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.clazz.GoodsClass;
import com.yeshi.fanli.exception.goods.GoodsClassException;
-import com.yeshi.fanli.exception.homemodule.FloatADException;
import com.yeshi.fanli.service.inter.config.BusinessSystemService;
import com.yeshi.fanli.service.inter.goods.GoodsClassService;
import com.yeshi.fanli.service.inter.goods.GoodsSecondClassService;
@@ -47,11 +47,9 @@
@Resource
private LabelClassService labelClassService;
- @Resource
- private BusinessSystemService businessSystemService;
@RequestMapping(value = "queryAll")
- public void listquery(String callback, Integer sex, PrintWriter out) {
+ public void listquery(AdminAcceptData acceptData, String callback, Integer sex, PrintWriter out) {
try {
List<GoodsClass> goodsClassList = goodsClassService.listquery(sex);
@@ -73,7 +71,7 @@
}
@RequestMapping(value = "getGoodsClasAll")
- public void getGoodsClassAll(String callback, PrintWriter out) {
+ public void getGoodsClassAll(AdminAcceptData acceptData,String callback, PrintWriter out) {
List<GoodsClass> goodsClassList = goodsClassService.getGoodsClassAll();
if (goodsClassList == null || goodsClassList.size() == 0) {
@@ -94,7 +92,7 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, GoodsClass goodsClass, String jumpType, HttpServletRequest request,
+ public void save(AdminAcceptData acceptData,String callback, GoodsClass goodsClass, String jumpType, HttpServletRequest request,
PrintWriter out) {
if (goodsClass.getTaobaoCids() != null)
goodsClass.setTaobaoCids(goodsClass.getTaobaoCids().replace("锛�", ","));
@@ -108,13 +106,34 @@
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (FloatADException e) {
+ } catch (GoodsClassException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
e.printStackTrace();
}
}
+
+ /**
+ * 淇敼鐘舵��
+ * @param callback
+ * @param id
+ * @param out
+ */
+ @RequestMapping(value = "switchState")
+ public void switchState(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
+ try {
+ goodsClassService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (GoodsClassException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ e.printStackTrace();
+ }
+ }
+
+
/**
* 淇敼鎺掑簭
@@ -124,7 +143,7 @@
* @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 {
goodsClassService.updateOrder(id, moveType);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
@@ -144,10 +163,8 @@
* @param out
*/
@RequestMapping(value = "deleteBatch")
- public void deleteBatch(String callback, String ids, PrintWriter out) {
-
+ public void deleteBatch(AdminAcceptData acceptData,String callback, String ids, PrintWriter out) {
Gson gson = new Gson();
-
try {
List<String> recordIds = gson.fromJson(ids, new TypeToken<ArrayList<String>>() {
}.getType());
@@ -170,12 +187,10 @@
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
}
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
-
}
/**
@@ -187,8 +202,7 @@
* @param response
*/
@RequestMapping(value = "removePicture")
- public void removePicture(String callback, Long id, PrintWriter out) {
-
+ public void removePicture(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
try {
GoodsClass goodsClass = goodsClassService.getGoodsClass(id);
@@ -208,7 +222,7 @@
}
@RequestMapping(value = "setSuperSystem")
- public void setSuperSystem(String callback, String type, Long gcid, String platform, String packageName,
+ public void setSuperSystem(AdminAcceptData acceptData,String callback, String type, Long gcid, String platform, String packageName,
PrintWriter out) {
platform = Utils.getMap().get(platform);
if (Constant.DEL.equals(type)) {
@@ -225,15 +239,10 @@
}
@RequestMapping(value = "getClassOption")
- public void getClassOption(String callback, PrintWriter out) {
-
+ public void getClassOption(AdminAcceptData acceptData,String callback, PrintWriter out) {
List<GoodsClass> goodsClassList = goodsClassService.getGoodsClassAll();
-
JSONObject data = new JSONObject();
-
data.put("result_list", goodsClassList);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
}
}
--
Gitblit v1.8.0