From 0ec43b39d1232e2e494a35f7d9437a76950aa483 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 05 十二月 2019 10:18:37 +0800
Subject: [PATCH] 2.0.5部分bug修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SpecialCardAdminController.java | 105 ++++++++++++++++++++++++++--------------------------
1 files changed, 52 insertions(+), 53 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 a8fb15d..d22d934 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
@@ -33,10 +33,9 @@
@Resource
private SpecialService specialService;
-
+
@Resource
private SpecialCardService specialCardService;
-
/**
* 淇濆瓨淇℃伅
@@ -46,16 +45,16 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, SpecialCard specialCard, HttpServletRequest request,PrintWriter out) {
+ public void save(String callback, SpecialCard specialCard, HttpServletRequest request, PrintWriter out) {
try {
- // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
if (request instanceof MultipartHttpServletRequest) {
- MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
- specialCardService.saveObject(fileRequest.getFile("file"), specialCard);
- }else{
- specialCardService.saveObject(null, specialCard);
- }
-
+ MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;
+ specialCardService.saveObject(fileRequest.getFile("file"), specialCard);
+ } else {
+ specialCardService.saveObject(null, specialCard);
+ }
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (FloatADException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -64,18 +63,19 @@
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 sort, PrintWriter out) {
+ public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer sort, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -86,21 +86,20 @@
}
try {
- List<SpecialCard> list = specialCardService.listQuery((pageIndex - 1) * pageSize,
- pageSize, key, sort);
+ List<SpecialCard> list = specialCardService.listQuery((pageIndex - 1) * pageSize, pageSize, key, sort);
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
-
+
long count = specialCardService.countlistQuery(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();
+ gsonBuilder.serializeNulls();
Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();
JSONObject data = new JSONObject();
@@ -116,9 +115,9 @@
}
-
/**
* 鍒犻櫎
+ *
* @param callback
* @param idArray
* @param out
@@ -133,16 +132,17 @@
}
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 = specialCardService.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("鍒犻櫎澶辫触"));
@@ -151,9 +151,6 @@
}
-
-
-
/**
* 淇濆瓨淇℃伅
*
@@ -162,16 +159,18 @@
* @param out
*/
@RequestMapping(value = "saveSpecial")
- public void saveSpecial(String callback, Special record, String jumpType, HttpServletRequest request,PrintWriter out) {
+ public void saveSpecial(String callback, Special record, String jumpType, HttpServletRequest request,
+ PrintWriter out) {
try {
- // 1. 鍏堝垽鏂環ttpRequest 鏄惁鍚湁鏂囦欢绫诲瀷
+ // 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);
- }
-
+ 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);
+ }
+
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇濆瓨鎴愬姛"));
} catch (SpecialException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
@@ -181,9 +180,9 @@
}
}
-
/**
* 鍒犻櫎涓撻
+ *
* @param callback
* @param idArray
* @param out
@@ -198,16 +197,17 @@
}
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 = specialService.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("鍒犻櫎澶辫触"));
@@ -215,7 +215,6 @@
}
}
-
/**
* 淇敼鎺掑簭
@@ -236,18 +235,19 @@
e.printStackTrace();
}
}
-
+
/**
- * 鏌ヨ涓撻
+ * 鏌ヨ涓撻
+ *
* @param callback
* @param pageIndex
* @param pageSize
- * @param bannerId
+ * @param bannerId
* @param out
*/
@RequestMapping(value = "querySpecial")
- public void querySpecial(String callback, Integer pageIndex, Integer pageSize, String key,
- Long cardId, Integer sex, PrintWriter out) {
+ public void querySpecial(String callback, Integer pageIndex, Integer pageSize, String key, Long cardId, Integer sex,
+ PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -261,23 +261,23 @@
out.print(JsonUtil.loadFalseResult("鍞竴鏍囪瘑ID涓嶈兘涓虹┖"));
return;
}
-
+
try {
-
+
List<Special> 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);
-
+
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();
@@ -292,6 +292,5 @@
}
}
-
-
+
}
--
Gitblit v1.8.0