From 573c491b4a1ba60e12a5678a01c1546c0077c1ee Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 30 七月 2019 09:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 534 +++++++++-------------------------------------------------
1 files changed, 86 insertions(+), 448 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 46239a4..05697c4 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
@@ -2,15 +2,14 @@
import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.commons.CommonsMultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.yeshi.utils.JsonUtil;
import com.google.gson.Gson;
@@ -18,16 +17,10 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.homemodule.Special;
import com.yeshi.fanli.entity.bus.homemodule.SpecialCard;
-import com.yeshi.fanli.entity.bus.homemodule.SuperSpecialCard;
-import com.yeshi.fanli.entity.common.JumpDetailV2;
-import com.yeshi.fanli.entity.system.BusinessSystem;
-import com.yeshi.fanli.service.AdminUserService;
-import com.yeshi.fanli.service.inter.common.JumpDetailV2Service;
-import com.yeshi.fanli.service.inter.config.BusinessSystemService;
-import com.yeshi.fanli.service.inter.config.SystemConfigService;
+import com.yeshi.fanli.exception.FloatADException;
+import com.yeshi.fanli.exception.homemodule.SpecialException;
import com.yeshi.fanli.service.inter.homemodule.SpecialCardService;
import com.yeshi.fanli.service.inter.homemodule.SpecialService;
-import com.yeshi.fanli.service.inter.homemodule.SuperSpecialCardService;
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
@@ -44,207 +37,33 @@
@Resource
private SpecialCardService specialCardService;
- @Resource
- private SuperSpecialCardService superSpecialCardService;
-
- @Resource
- private SystemConfigService systemConfigService;
-
- @Resource
- private JumpDetailV2Service jumpDetailV2Service;
-
- @Resource
- private AdminUserService adminUserService;
-
- @Resource
- private BusinessSystemService businessSystemService;
-
-
-
+
/**
- * 鏂板
+ * 淇濆瓨淇℃伅
+ *
* @param callback
* @param special
* @param out
*/
- @RequestMapping(value = "saveAdd")
- public void saveAdd(String callback, SpecialCard specialCard, PrintWriter out) {
-
+ @RequestMapping(value = "save")
+ public void save(String callback, SpecialCard specialCard, HttpServletRequest request,PrintWriter out) {
try {
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ if (request instanceof MultipartHttpServletRequest) {
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ specialCardService.saveObject(fileRequest.getFile("file"), specialCard);
+ }else{
+ specialCardService.saveObject(null, specialCard);
+ }
- String name = specialCard.getName();
- String card = specialCard.getCard();
-
- if (StringUtil.isNullOrEmpty(name) || StringUtil.isNullOrEmpty(card)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("涓撻淇℃伅涓庢爣璇嗕笉鑳戒负绌�"));
- return;
- }
-
- Date nowTime = new Date();
- specialCard.setState(1); // 榛樿鍋滅敤
- specialCard.setCreatetime(nowTime);
- specialCard.setUpdatetime(nowTime);
- specialCardService.insert(specialCard);
-
- List<BusinessSystem> systemList = businessSystemService.getBusinessSystems();
- if (systemList != null && systemList.size() > 0) {
- for (BusinessSystem system: systemList) {
- SuperSpecialCard superCard = new SuperSpecialCard();
- superCard.setSpecialCard(specialCard);
- superCard.setSystem(system);
- superSpecialCardService.insertSelective(superCard);
- }
- }
-
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
-
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ } catch (FloatADException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
e.printStackTrace();
}
}
-
- /**
- * 淇敼
- * @param callback
- * @param special
- * @param out
- */
- @RequestMapping(value = "saveModify")
- public void saveModify(String callback, SpecialCard specialCard, PrintWriter out) {
- try {
-
- Long id = specialCard.getId();
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- SpecialCard resultObj = specialCardService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- String name = specialCard.getName();
- String card = specialCard.getCard();
- if (StringUtil.isNullOrEmpty(name) && StringUtil.isNullOrEmpty(card)) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼鍐呭涓嶈兘涓虹┖"));
- return;
- }
-
- if (StringUtil.isNullOrEmpty(name)) {
- specialCard.setName(null);
- }
-
- if (StringUtil.isNullOrEmpty(card)) {
- specialCard.setCard(null);
- }
-
- specialCard.setUpdatetime(new Date());
- specialCardService.updateByPrimaryKeySelective(specialCard);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
- }
-
-
- /**
- * 淇鐘舵��
- * @param callback
- * @param id
- * @param out
- */
- @RequestMapping(value = "updateState")
- public void updateState(String callback, Long id, PrintWriter out) {
- try {
-
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- SpecialCard resultObj = specialCardService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- Integer state = resultObj.getState();
- if (state == null || state.equals(1) || state == 1) {
- resultObj.setState(0);
- } else {
- resultObj.setState(1);
- }
-
- specialCardService.updateByPrimaryKeySelective(resultObj);
-
- JSONObject data = new JSONObject();
- data.put("state", resultObj.getState());
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
- }
-
- /**
- * 淇敼绯荤粺鐘舵��
- * @param callback
- * @param type
- * @param cardId
- * @param systemId
- * @param out
- */
- @RequestMapping(value = "saveSystemState")
- public void saveSystemState(String callback, Long cardId, Long systemId, PrintWriter out) {
-
- if (cardId == null || systemId == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
- return;
- }
-
- try {
- List<SuperSpecialCard> list = superSpecialCardService.querybyCardIdAndSystemId(cardId, systemId);
-
- if (list != null && list.size() > 0) {
- superSpecialCardService.deletebyCardIdAndSystemId(cardId, systemId);
- JSONObject data = new JSONObject();
- data.put("check", 0);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- } else {
-
- SpecialCard specialCard = new SpecialCard();
- specialCard.setId(cardId);
-
- BusinessSystem system = new BusinessSystem();
- system.setId(systemId);
-
- SuperSpecialCard superCard = new SuperSpecialCard();
- superCard.setSpecialCard(specialCard);
- superCard.setSystem(system);
-
- superSpecialCardService.insertSelective(superCard);
- JSONObject data = new JSONObject();
- data.put("check", 1);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
- }
-
- } catch (Exception e1) {
- e1.printStackTrace();
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇敼澶辫触"));
- }
-
- }
-
-
/**
* 鏌ヨ
@@ -275,11 +94,6 @@
return;
}
- for (SpecialCard specialCard: list) {
- long totalSpecial= specialService.countlistQueryByCard(specialCard.getId(), null);
- specialCard.setTotalSpecial(totalSpecial);
- }
-
long count = specialCardService.countlistQuery(key);
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
@@ -339,188 +153,30 @@
- /**
- * 鏌ヨ涓撻
- * @param callback
- * @param pageIndex
- * @param pageSize
- * @param bannerId
- * @param out
- */
- @RequestMapping(value = "querySpecial")
- public void querySpecial(String callback, Integer pageIndex, Integer pageSize, String key,
- Long cardId, PrintWriter out) {
-
- if (pageIndex == null || pageIndex < 1) {
- pageIndex = 1;
- }
-
- if (pageSize == null || pageSize < 1) {
- pageSize = Constant.PAGE_SIZE;
- }
-
- if (cardId == null) {
- out.print(JsonUtil.loadFalseResult("鍞竴鏍囪瘑ID涓嶈兘涓虹┖"));
- return;
- }
-
- try {
-
- List<Special> list = specialService.listQueryByCard((pageIndex - 1) * pageSize,
- pageSize, cardId, key);
-
- if (list == null || list.size() == 0) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
- return;
- }
-
- // 璺宠浆閾炬帴
- for (Special special: list) {
- String params = special.getParams();
- if (!StringUtil.isNullOrEmpty(params)) {
- JSONObject jsonData = JSONObject.fromObject(params);
- if (jsonData.get("url") != null){
- special.setParams(jsonData.get("url").toString());
- } else {
- special.setParams(null);
- }
- }
-
- JumpDetailV2 jumpDetail = special.getJumpDetail();
- if (jumpDetail == null) {
- // 榛樿鏈�夋嫨
- JumpDetailV2 jumpDetailV2 = new JumpDetailV2();
- jumpDetailV2.setName("-鏈�夋嫨-");
- jumpDetailV2.setType("default");
- special.setJumpDetail(jumpDetailV2);
- }
- }
-
- long count = specialService.countlistQueryByCard(cardId, key);
-
- 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();
- Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
-
- 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 record
- * @param out
- */
- @RequestMapping(value = "modifySpecial")
- public void modifySpecial(String callback, Special record, String jumpType, PrintWriter out) {
-
- Long id = record.getId();
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- try {
-
- Special resultObj = specialService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- String params = record.getParams();
- if (!StringUtil.isNullOrEmpty(params)) {
- String jumpValue = systemConfigService.get("jump");
- if (StringUtil.isNullOrEmpty(jumpValue)) {
- jumpValue = "{\"url\":\"#\"}";
- }
- params = jumpValue.replace("#", params);
- }
-
- if (!StringUtil.isNullOrEmpty(jumpType)) {
- List<JumpDetailV2> listByType = jumpDetailV2Service.listByType(jumpType);
- if (listByType !=null && listByType.size() > 0) {
- resultObj.setJumpDetail(listByType.get(0));
- }
- }
-
-
- String name = record.getName();
- if (name != null && name.trim().length() > 0) {
- resultObj.setName(name);
- }
-
- if (params != null && params.trim().length() > 0) {
- resultObj.setParams(params);
- }
-
- String showType = record.getShowType();
- if (showType != null && showType.trim().length() > 0) {
- resultObj.setShowType(record.getShowType());
- }
-
- String remark = record.getRemark();
- if (remark != null && remark.trim().length() > 0) {
- resultObj.setRemark(remark);
- }
-
- specialService.updateByPrimaryKey(resultObj);
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
- e.printStackTrace();
- }
- }
-
- /**
- * 涓撻鍥剧墖涓婁紶
- * @param file
- * @param uid
- * @param id
- * @param request
- * @param response
+ * @param special
* @param out
*/
@RequestMapping(value = "saveSpecial")
- public void saveSpecial(@RequestParam("file") CommonsMultipartFile file, Long id, Long cardId,
- PrintWriter out) {
-
- if (file == null) {
- out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
- return;
- }
-
+ public void saveSpecial(String callback, Special record, String jumpType, HttpServletRequest request,PrintWriter out) {
try {
- Special resultObj = null;
- if (id != null) {
- resultObj = specialService.selectByPrimaryKey(id);
- if (resultObj == null) {
- out.print(JsonUtil.loadFalseResult("璇ヤ笓棰樺凡涓嶅瓨鍦�"));
- return;
- }
- }
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ if (request instanceof MultipartHttpServletRequest) {
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ specialService.saveObject(fileRequest.getFile("file"), fileRequest.getFile("file2"), fileRequest.getFile("file3"), record, jumpType);
+ }else{
+ specialService.saveObject(null, null, null, record, jumpType);
+ }
- specialService.uploadPicture(file, resultObj, cardId);
- out.print(JsonUtil.loadTrueResult("涓婁紶鎴愬姛"));
-
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
+ } catch (SpecialException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (Exception e) {
- out.print(JsonUtil.loadFalseResult("鎿嶄綔澶辫触"));
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
e.printStackTrace();
}
}
@@ -560,48 +216,6 @@
}
- /**
- * 淇鐘舵��
- * @param callback
- * @param id
- * @param out
- */
- @RequestMapping(value = "updateSpecialState")
- public void updateSpecialState(String callback, Long id, PrintWriter out) {
- try {
-
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
- return;
- }
-
- Special resultObj = specialService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
- return;
- }
-
- Long state = resultObj.getState();
- if (state == null || state.equals(1) || state == 1) {
- resultObj.setState(0L);
- } else {
- resultObj.setState(1L);
- }
-
- specialService.updateByPrimaryKeySelective(resultObj);
-
- JSONObject data = new JSONObject();
- data.put("state", resultObj.getState());
-
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
- } catch (Exception e) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
- e.printStackTrace();
- }
- }
-
-
/**
* 淇敼鎺掑簭
@@ -611,49 +225,73 @@
* @param out
*/
@RequestMapping(value = "saveSpecialOrder")
- public void saveSpecialOrder(String callback, Long id,Integer moveType, PrintWriter out) {
-
- if (moveType == null || (!moveType.equals(1) && !moveType.equals(-1))) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掔殑绫诲瀷涓嶆纭�"));
- return;
+ public void saveSpecialOrder(String callback, Long id, Integer moveType, Integer sex, PrintWriter out) {
+ try {
+ specialService.updateOrder(id, moveType, sex);
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ } catch (SpecialException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("淇濆瓨澶辫触"));
+ e.printStackTrace();
}
-
- if (id == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
+ }
+
+ /**
+ * 鏌ヨ涓撻
+ * @param callback
+ * @param pageIndex
+ * @param pageSize
+ * @param bannerId
+ * @param out
+ */
+ @RequestMapping(value = "querySpecial")
+ public void querySpecial(String callback, Integer pageIndex, Integer pageSize, String key,
+ Long cardId, Integer sex, PrintWriter out) {
+
+ if (pageIndex == null || pageIndex < 1) {
+ pageIndex = 1;
+ }
+
+ if (pageSize == null || pageSize < 1) {
+ pageSize = Constant.PAGE_SIZE;
+ }
+
+ if (cardId == null) {
+ out.print(JsonUtil.loadFalseResult("鍞竴鏍囪瘑ID涓嶈兘涓虹┖"));
return;
}
try {
+
+ List<Special> list = specialService.listQueryByCard((pageIndex - 1) * pageSize, pageSize, cardId, key, sex);
- Special resultObj = specialService.selectByPrimaryKey(id);
- if (resultObj == null) {
- JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
+ if (list == null || list.size() == 0) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
- Long cid = resultObj.getCardId();
- Integer oldOrder = resultObj.getOrderby();
- List<Special> list = specialService.getOrderByCardID(cid, moveType, oldOrder);
+ long count = specialService.countlistQueryByCard(cardId, key, sex);
- if (list != null && list.size() > 0) {
- Special changeObj = list.get(0);
- // 浜ゆ崲鎺掑簭搴忓彿
- resultObj.setOrderby(changeObj.getOrderby());
-
- changeObj.setOrderby(oldOrder);
-
- specialService.updateByPrimaryKeySelective(changeObj);
- }
-
- specialService.updateByPrimaryKeySelective(resultObj);
+ int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
+ PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
+ GsonBuilder gsonBuilder = new GsonBuilder();
+ gsonBuilder.serializeNulls();
+ Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
+
+ 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) {
- e.printStackTrace();
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
}
}
+
}
--
Gitblit v1.8.0