From 98b1a0affd69bbe63223c21fdd2c404e8bedfccb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 20 五月 2020 17:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into 2.1.2
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/LabelGoodsAdminController.java | 159 ++++------------------------------------------------
1 files changed, 13 insertions(+), 146 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LabelGoodsAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LabelGoodsAdminController.java
index 5ad27fa..876f67d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/LabelGoodsAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/LabelGoodsAdminController.java
@@ -7,24 +7,16 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import net.sf.json.JSONObject;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
-import com.yeshi.fanli.entity.bus.lable.LabelGoods;
import com.yeshi.fanli.entity.common.AdminUser;
-import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
-import com.yeshi.fanli.service.inter.goods.TaoBaoGoodsBriefService;
import com.yeshi.fanli.service.inter.lable.LabelGoodsService;
-import com.yeshi.fanli.service.inter.lable.LabelService;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.taobao.TaoBaoUtil;
-import org.yeshi.utils.JsonUtil;
@Controller
@RequestMapping("admin/new/api/v1/labelGoods")
@@ -32,125 +24,7 @@
@Resource
private LabelGoodsService labelGoodsService;
- @Resource
- private TaoBaoGoodsBriefService taoBaoGoodsBriefService;
- @Resource
- private LabelService labelService;
- /**
- * 鎵归噺璐存爣绛�---绮惧搧搴�
- *
- * @param callback
- * @param param
- * @param auctionIds
- * @param request
- * @param out
- */
- @RequestMapping(value = "addBatch")
- public void addBatch(String callback, String lables, String ids, HttpServletRequest request, PrintWriter out) {
-
- // 閼惧嘲褰囪ぐ鎾冲閹垮秳缍旈悽銊﹀煕
- AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-
- if (admin == null) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
- } else {
-
- try {
- if (StringUtil.isNullOrEmpty(lables)) {
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏈～鍐欐爣绛惧悕绉�")));
-
- } else {
-
- Gson gson = new Gson();
- List<String> idList = gson.fromJson(ids, new TypeToken<ArrayList<String>>() {
- }.getType());
-
- if (idList == null || idList.size() == 0) {
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("璇烽�夋嫨鍟嗗搧")));
-
- } else {
-
- String[] arrtitle = lables.split("\\s+");
-
- labelGoodsService.setGoodsLabel(arrtitle, idList, admin);
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛")));
- }
-
- }
-
- } catch (Exception e) {
- // TODO Auto-generated catch block
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触")));
- e.printStackTrace();
- }
-
- }
-
- }
-
- /**
- * 鎵归噺娣诲姞鏍囩 --- 绮惧搧搴擄紙闅忔満鏉冮噸锛�
- *
- * @param callback
- * @param label
- * @param request
- * @param out
- * @param 鏉冮噸鑼冨洿 澶у��
- * @param 浣ｉ噾鑼冨洿
- * 灏忓��
- */
- @RequestMapping(value = "addBatchRandom")
- public void addBatchRandom(String callback, String lables, String ids, Integer weight, Integer weightSmall, Integer weightLarge, HttpServletRequest request, PrintWriter out) {
-
- // 鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛
- AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-
- if (admin == null) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
- } else {
-
- try {
-
- if (StringUtil.isNullOrEmpty(lables)) {
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏈～鍐欐爣绛惧悕绉�")));
- } else {
-
- if (StringUtil.isNullOrEmpty(ids)) {
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("鏈�夋嫨闇�鎿嶄綔鐨勫晢鍝�")));
-
- } else {
- Gson gson = new Gson();
- List<String> idList = gson.fromJson(ids, new TypeToken<ArrayList<String>>() {
- }.getType());
-
- if (idList == null || idList.size() == 0) {
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("璇烽�夋嫨闇�鎿嶄綔鐨勫晢鍝�")));
-
- } else {
- String[] arrtitle = lables.split("\\s+");
-
- labelGoodsService.addBatchRandom(arrtitle, idList, admin, weight, weightSmall, weightLarge);
-
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛")));
- }
-
- }
- }
-
- } catch (Exception e) {
- // TODO Auto-generated catch block
- out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("娣诲姞寮傚父")));
- e.printStackTrace();
- }
-
- }
- }
/**
* 鎵归噺鍟嗗搧娣诲姞鏍囩-鍏宠仈lableId
@@ -165,28 +39,21 @@
public void batchGoodsAddLables(String callback, String labIds, String ids,
HttpServletRequest request, PrintWriter out) {
+ if (StringUtil.isNullOrEmpty(ids)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨闇�鎿嶄綔鐨勫晢鍝�"));
+ return;
+ }
+
+ Gson gson = new Gson();
+ List<Long> goodsIdList = gson.fromJson(ids, new TypeToken<ArrayList<Long>>() {}.getType());
+ if (goodsIdList == null || goodsIdList.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨闇�鎿嶄綔鐨勫晢鍝�"));
+ return;
+ }
+
try {
// 鑾峰彇褰撳墠鎿嶄綔鐢ㄦ埛
AdminUser admin = (AdminUser) request.getSession().getAttribute(Constant.SESSION_ADMIN);
-
-// if (admin == null) {
-// out.print(JsonUtil.loadJSONP(callback, JsonUtil.loadFalseResult("褰撳墠璐︽埛澶辨晥,璇烽噸鏂扮櫥闄嗐��")));
-// return;
-// }
-
- if (StringUtil.isNullOrEmpty(ids)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨闇�鎿嶄綔鐨勫晢鍝�"));
- return;
- }
-
- Gson gson = new Gson();
- List<Long> goodsIdList = gson.fromJson(ids, new TypeToken<ArrayList<Long>>() {}.getType());
- if (goodsIdList == null || goodsIdList.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨闇�鎿嶄綔鐨勫晢鍝�"));
- return;
- }
-
-
if (goodsIdList.size() == 1) {
List<Long> labIdList = null;
--
Gitblit v1.8.0