From 1e92eff67b997263ecefa255c63eb6641c47b57f Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 14 六月 2019 10:22:33 +0800
Subject: [PATCH] 设备消息BUG解决，品牌
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java | 135 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 68 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 1d8bcfd..ed79a50 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
@@ -37,14 +37,13 @@
@Controller
@RequestMapping("admin/new/api/v1/brand")
public class BrandShopAdminController {
-
+
@Resource
private BrandClassService brandClassService;
-
+
@Resource
private BrandClassShopService brandClassShopService;
-
-
+
/**
* 淇濆瓨淇℃伅
*
@@ -55,7 +54,7 @@
@RequestMapping(value = "save")
public void save(String callback, BrandClass brandClass, PrintWriter out) {
try {
- brandClassService.saveObject(brandClass);
+ brandClassService.saveObject(brandClass);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (BrandClassException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -65,8 +64,6 @@
}
}
-
-
/**
* 淇敼鎺掑簭
*
@@ -86,20 +83,20 @@
e.printStackTrace();
}
}
-
-
/**
* 鏌ヨ
+ *
* @param callback
* @param pageIndex
* @param pageSize
- * @param key 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
+ * @param key
+ * 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key,
- Integer state, PrintWriter out) {
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,
+ PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -116,14 +113,14 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
+
long count = brandClassService.countQuery(key, state);
-
+
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
GsonBuilder gsonBuilder = new GsonBuilder();
- gsonBuilder.serializeNulls();
+ gsonBuilder.serializeNulls();
Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
JSONObject data = new JSONObject();
@@ -138,9 +135,9 @@
}
}
-
/**
* 鍒犻櫎
+ *
* @param callback
* @param idArray
* @param out
@@ -154,22 +151,24 @@
return;
}
Gson gson = new Gson();
- List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+ List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+ }.getType());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
return;
}
int count = brandClassService.deleteBatchByPrimaryKey(list);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎["+ count +"]鏉℃暟鎹�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
}
-
+
/**
* 绛涢�夊垪琛�
+ *
* @param callback
* @param out
*/
@@ -184,14 +183,14 @@
List<Object> result_list = new ArrayList<Object>();
if (list != null && list.size() > 0) {
- for (BrandClass record: list) {
- Map<String,Object> map =new HashMap<String,Object>();
+ for (BrandClass record : list) {
+ Map<String, Object> map = new HashMap<String, Object>();
map.put("key", record.getId());
map.put("value", record.getName());
result_list.add(map);
}
}
-
+
JSONObject data = new JSONObject();
data.put("result_list", result_list);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
@@ -201,14 +200,14 @@
}
}
-
-
/**
* 鏌ヨ
+ *
* @param callback
* @param pageIndex
* @param pageSize
- * @param key 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
+ * @param key
+ * 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
* @param out
*/
@RequestMapping(value = "queryTaoBaoShop")
@@ -217,59 +216,58 @@
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
}
-
+
if (pageSize == null || pageSize < 1) {
pageSize = Constant.PAGE_SIZE;
}
-
+
try {
- TaoBaoShopInfoDTO taoBaoShopInfoDTO = TaoKeApiUtil.searchShop(key, pageIndex, pageSize);
-
+ TaoBaoShopInfoDTO taoBaoShopInfoDTO = TaoKeApiUtil.searchShop(key, pageIndex, pageSize);
+
List<TaoBaoShopInfo> listInfo = taoBaoShopInfoDTO.getListInfo();
if (listInfo == null || listInfo.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
+
List<Long> listShopId = new ArrayList<Long>();
- for (TaoBaoShopInfo taoBaoShopInfo: listInfo) {
+ for (TaoBaoShopInfo taoBaoShopInfo : listInfo) {
listShopId.add(taoBaoShopInfo.getUserId());
}
-
+
// 宸插瓨鍦ㄦ暟鎹簱涓�
List<BrandClassShop> listExist = brandClassShopService.getExistByShopIds(listShopId);
-
+
JSONArray array = new JSONArray();
- for (TaoBaoShopInfo taoBaoShopInfo: listInfo) {
+ for (TaoBaoShopInfo taoBaoShopInfo : listInfo) {
String name = "";
if (listExist != null && listExist.size() > 0) {
Long userId = taoBaoShopInfo.getUserId();
- for (BrandClassShop brandClassShop: listExist) {
+ for (BrandClassShop brandClassShop : listExist) {
TaoBaoShop shop = brandClassShop.getShop();
- if (shop !=null && userId == shop.getId() || userId.equals(shop.getId()) ) {
+ if (shop != null && userId == shop.getId() || userId.equals(shop.getId())) {
BrandClass brandClass = brandClassShop.getBrandClass();
name = brandClass.getName();
}
}
}
-
+
JSONObject innerData = new JSONObject();
innerData.put("cname", name);
innerData.put("shopInfo", taoBaoShopInfo);
array.add(innerData);
}
-
+
JSONObject data = new JSONObject();
data.put("pe", taoBaoShopInfoDTO.getPage());
- data.put("result_list",array);
+ data.put("result_list", array);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
}
}
-
-
+
/**
* 娣诲姞搴楅摵鍏ュ簱
*
@@ -278,20 +276,21 @@
* @param out
*/
@RequestMapping(value = "saveShopInfo")
- public void saveShopInfo(String callback,Long cid, String idArray, PrintWriter out) {
+ public void saveShopInfo(String callback, Long cid, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
return;
}
Gson gson = new Gson();
- List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+ List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+ }.getType());
- String shopIds = brandClassShopService.saveShopInfo(cid,list);
+ String shopIds = brandClassShopService.saveShopInfo(cid, list);
if (StringUtil.isNullOrEmpty(shopIds)) {
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} else {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浠ヤ笅搴楅摵ID:"+ shopIds + ",鏈坊鍔犳垚鍔�"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浠ヤ笅搴楅摵ID:" + shopIds + ",鏈坊鍔犳垚鍔�"));
}
} catch (BrandClassShopException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -300,20 +299,20 @@
e.printStackTrace();
}
}
-
-
/**
* 鏌ヨ
+ *
* @param callback
* @param pageIndex
* @param pageSize
- * @param key 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
+ * @param key
+ * 妯＄硦鏌ヨ锛氳鏄庛�佹爣璇�
* @param out
*/
@RequestMapping(value = "queryClassShop")
- public void queryClassShop(String callback, Integer pageIndex, Integer pageSize, String key,
- Long cid , Integer state, PrintWriter out) {
+ public void queryClassShop(String callback, Integer pageIndex, Integer pageSize, String key, Long cid,
+ Integer state, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -324,20 +323,21 @@
}
try {
- List<BrandClassShop> list = brandClassShopService.listQuery((pageIndex - 1) * pageSize, pageSize, key, cid, state);
+ List<BrandClassShop> list = brandClassShopService.listQuery((pageIndex - 1) * pageSize, pageSize, key, cid,
+ state);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
+
long count = brandClassShopService.countQuery(key, cid, state);
-
+
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
GsonBuilder gsonBuilder = new GsonBuilder();
- gsonBuilder.serializeNulls();
+ gsonBuilder.serializeNulls();
Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
JSONObject data = new JSONObject();
@@ -352,7 +352,6 @@
}
}
-
/**
* 淇濆瓨淇℃伅
*
@@ -362,14 +361,14 @@
*/
@RequestMapping(value = "saveClassShop")
public void saveClassShop(String callback, Long id, Long cid, String shopName, Integer state, Integer top,
- HttpServletRequest request, PrintWriter out) {
+ String key, HttpServletRequest request, PrintWriter out) {
try {
if (request instanceof MultipartHttpServletRequest) {
- MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
- brandClassShopService.changeShopInfo(fileRequest.getFile("file"), id, cid, shopName, state, top);
- }else{
- brandClassShopService.changeShopInfo(null, id, cid, shopName, state, top);
- }
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ brandClassShopService.changeShopInfo(fileRequest.getFile("file"), id, cid, shopName, state, top, key);
+ } else {
+ brandClassShopService.changeShopInfo(null, id, cid, shopName, state, top, key);
+ }
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (BrandClassShopException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -378,8 +377,7 @@
e.printStackTrace();
}
}
-
-
+
/**
* 淇敼鎺掑簭
*
@@ -399,10 +397,10 @@
e.printStackTrace();
}
}
-
-
+
/**
* 鍒犻櫎
+ *
* @param callback
* @param idArray
* @param out
@@ -415,15 +413,16 @@
return;
}
Gson gson = new Gson();
- List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
+ List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {
+ }.getType());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
return;
}
-
+
brandClassShopService.deleteBatchByPrimaryKey(list);
-
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鍒犻櫎鎴愬姛"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
--
Gitblit v1.8.0