From 7e7db2fa55a9a3af46d4fd8ede0dee147f101d64 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期六, 09 五月 2020 21:41:27 +0800
Subject: [PATCH] 2.1需求
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
index 89b88ae..0c9283d 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java
@@ -21,7 +21,8 @@
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;
-import com.yeshi.fanli.exception.homemodule.FloatADException;
+import com.yeshi.fanli.entity.bus.homemodule.SpecialExtra;
+import com.yeshi.fanli.exception.homemodule.SpecialCardException;
import com.yeshi.fanli.exception.homemodule.SpecialException;
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
@@ -30,6 +31,7 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
+import com.yeshi.fanli.vo.homemodule.SpecialVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
@@ -67,9 +69,8 @@
} else {
specialCardService.saveObject(null, specialCard);
}
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
- } catch (FloatADException e) {
+ } catch (SpecialCardException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
@@ -118,9 +119,7 @@
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();
@@ -137,7 +136,6 @@
*/
@RequestMapping(value = "delete")
public void delete(String callback, String idArray, PrintWriter out) {
-
try {
if (StringUtil.isNullOrEmpty(idArray)) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璇烽�夋嫨鎿嶄綔鐨勬暟鎹�"));
@@ -152,16 +150,12 @@
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏈娴嬪埌鍒犻櫎鐨勬暟鎹�"));
return;
}
-
int count = specialCardService.deleteBatchByPrimaryKey(list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
-
}
/**
@@ -172,16 +166,16 @@
* @param out
*/
@RequestMapping(value = "saveSpecial")
- public void saveSpecial(String callback, Special record, String jumpType, HttpServletRequest request,
+ public void saveSpecial(String callback, Special record, String jumpType, SpecialExtra extra, HttpServletRequest request,
PrintWriter out) {
try {
// 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
specialService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"),
- fileRequest.getFile("file3"), record, jumpType);
+ fileRequest.getFile("file3"), record, jumpType, extra);
} else {
- specialService.saveObject(null, null, null, record, jumpType);
+ specialService.saveObject(null, null, null, record, jumpType, extra);
}
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
@@ -219,14 +213,11 @@
}
int count = specialService.deleteBatchByPrimaryKey(list);
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎴愬姛鍒犻櫎[" + count + "]鏉℃暟鎹�"));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍒犻櫎澶辫触"));
e.printStackTrace();
}
-
}
/**
@@ -292,20 +283,18 @@
try {
- List<Special> list = specialService.listQueryByCard((pageIndex - 1) * pageSize, pageSize, cardId, key, sex);
- long count = specialService.countlistQueryByCard(cardId, key, sex);
- // 鑾峰彇鏈夋晥鐨勪笓棰�
-
+ List<SpecialVO> list = specialService.listQueryByCard((pageIndex - 1) * pageSize, pageSize, cardId, key, sex);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
+ long count = specialService.countlistQueryByCard(cardId, key, sex);
// 杩囨护
if (versionList != null) {
if (versionList.size() > 0) {
List<Long> sourceIdList = new ArrayList<>();
- for (Special special : list) {
+ for (SpecialVO special : list) {
sourceIdList.add(special.getId());
}
List<Long> versionIdList = new ArrayList<>();
@@ -335,9 +324,7 @@
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();
@@ -387,6 +374,25 @@
* @param id
* @param out
*/
+ @RequestMapping(value = "switchStateCard")
+ public void switchStateCard(String callback, Long id, PrintWriter out) {
+ try {
+ specialCardService.switchState(id);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (SpecialCardException 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(String callback, Long id, PrintWriter out) {
try {
--
Gitblit v1.8.0