From eec7e789a87863c25d92c10ad5dfc22ad80c448d Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 14 七月 2020 12:36:48 +0800
Subject: [PATCH] 系统区分BUG修复
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
index 1ebcc8a..d29b412 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java
@@ -9,6 +9,7 @@
import javax.annotation.Resource;
+import com.yeshi.fanli.entity.accept.AdminAcceptData;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.yeshi.utils.JsonUtil;
@@ -53,7 +54,7 @@
* @param out
*/
@RequestMapping(value = "save")
- public void save(String callback, PushGoods pushGoods, String idArray, String arrayIOS,
+ public void save(AdminAcceptData acceptData,String callback, PushGoods pushGoods, String idArray, String arrayIOS,
String arrayAndroid, PrintWriter out) {
try {
@@ -86,6 +87,31 @@
}
}
+
+ /**
+ * 鏂板/淇敼
+ *
+ * @param callback
+ * @param special
+ * @param out
+ */
+ @RequestMapping(value = "saveInfo")
+ public void saveInfo(AdminAcceptData acceptData,String callback, PushGoods pushGoods, String arrayIOS, String arrayAndroid, PrintWriter out) {
+ try {
+ // 鐗堟湰澶勭悊
+ convertVersion(pushGoods, arrayIOS, arrayAndroid);
+ // 淇濆瓨
+ pushGoodsService.saveInfo(pushGoods);
+
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("娣诲姞鎴愬姛"));
+ } catch (PushGoodsException e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
+ } catch (Exception e) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
+ e.printStackTrace();
+ }
+ }
+
/**
* 鍒犻櫎
*
@@ -94,7 +120,7 @@
* @param out
*/
@RequestMapping(value = "delete")
- public void delete(String callback, String idArray, PrintWriter out) {
+ public void delete(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) {
try {
if (StringUtil.isNullOrEmpty(idArray)) {
@@ -132,7 +158,7 @@
* @param out
*/
@RequestMapping(value = "getPushInfo")
- public void getPushInfo(String callback, Long id, PrintWriter out) {
+ public void getPushInfo(AdminAcceptData acceptData,String callback, Long id, PrintWriter out) {
if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鍙傛暟涓嶈兘涓虹┖"));
@@ -150,10 +176,8 @@
Date controlTime = pushGoods.getControlTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
if (controlTime == null) {
- pushGoods.setTimeTask(false);
pushGoods.setControlTime_str("");
} else {
- pushGoods.setTimeTask(true);
pushGoods.setControlTime_str(sdf.format(controlTime));
}
@@ -203,7 +227,7 @@
* @param out
*/
@RequestMapping(value = "query")
- public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
+ public void query(AdminAcceptData acceptData, String callback, Integer pageIndex, Integer pageSize, String key, Integer state, PrintWriter out) {
if (pageIndex == null || pageIndex < 1) {
pageIndex = 1;
@@ -215,22 +239,19 @@
try {
- List<PushGoods> list = pushGoodsService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state);
-
+ List<PushGoods> list = pushGoodsService.listQuery((pageIndex - 1) * pageSize, pageSize, key, state,acceptData.getSystem());
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏆傛棤鏁版嵁"));
return;
}
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
for (PushGoods pushGoods : list) {
Date controlTime = pushGoods.getControlTime();
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm");
if (controlTime == null) {
- pushGoods.setTimeTask(false);
pushGoods.setControlTime_str("");
} else {
- pushGoods.setTimeTask(true);
pushGoods.setControlTime_str(sdf.format(controlTime));
}
@@ -241,7 +262,7 @@
convertVersionList(pushGoods);
}
- long count = pushGoodsService.countQuery(key, state);
+ long count = pushGoodsService.countQuery(key, state,acceptData.getSystem());
int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);
PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);
@@ -266,23 +287,19 @@
/**
* 鍟嗗搧鎺ㄩ��
*
- * @param id 鎺ㄩ�乮d
* @param out
* @throws Exception
*/
@RequestMapping(value = "push")
- public void push(String callback, String idArray, PrintWriter out) throws Exception {
-
+ public void push(AdminAcceptData acceptData,String callback, String idArray, PrintWriter out) throws Exception {
if (idArray == null || idArray.trim().length() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
return;
}
try {
-
Gson gson = new Gson();
List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());
-
if (list == null || list.size() == 0) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("浼犻�掑弬鏁颁笉鑳戒负绌�"));
return;
@@ -291,9 +308,7 @@
for (Long id: list) {
pushGoodsService.handPush(id);
}
-
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎺ㄩ�佹垚鍔�"));
-
} catch (PushException e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));
} catch (PushGoodsException e) {
@@ -370,7 +385,7 @@
} else {
JSONObject json = JSONObject.fromObject(versions);
- String versionsIOS = json.getString("IOS");
+ String versionsIOS = json.optString("IOS");
if (versionsIOS != null && versionsIOS.trim().length() > 0) {
listIOS = Arrays.asList(versionsIOS.split(","));
}
--
Gitblit v1.8.0