From 626d711cb15896055c13fe344eb7fcc824589715 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期四, 19 十二月 2019 15:38:42 +0800
Subject: [PATCH] 帮助中心
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java | 94 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 78 insertions(+), 16 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java
index bafe564..a17e140 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java
@@ -40,9 +40,7 @@
*/
// @RequestMapping(value = "saveAdd")
public void saveAdd(String callback, AppPageNotification appPageNotification, PrintWriter out) {
-
try {
-
String content = appPageNotification.getContent();
if (StringUtil.isNullOrEmpty(content) ) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鏄剧ず鍐呭涓嶈兘涓虹┖"));
@@ -61,6 +59,29 @@
+ "#" + content + "#" + appPageNotification.getContentUrl()));
} else {
appPageNotification.setMd5(StringUtil.Md5(null + "#" + content + "#" + appPageNotification.getContentUrl()));
+ }
+
+ Boolean show = appPageNotification.getShow();
+ if (show == null) {
+ show = false;
+ appPageNotification.setShow(show);
+ }
+
+ Boolean canClose = appPageNotification.getCanClose();
+ if (canClose == null) {
+ canClose = false;
+ appPageNotification.setCanClose(canClose);
+ }
+
+ String contentUrl = appPageNotification.getContentUrl();
+ if (canClose != null && canClose && !StringUtil.isNullOrEmpty(contentUrl)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴鍜屽厑璁稿叧闂笉鍙悓鏃跺瓨鍦�"));
+ return;
+ }
+
+ if (!canClose && StringUtil.isNullOrEmpty(contentUrl)) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴涓嶈兘涓虹┖"));
+ return;
}
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
@@ -114,6 +135,28 @@
return;
}
+ Boolean show = appPageNotification.getShow();
+ if (show == null) {
+ show = false;
+ appPageNotification.setShow(show);
+ }
+
+ Boolean canClose = appPageNotification.getCanClose();
+ if (canClose == null) {
+ canClose = false;
+ appPageNotification.setCanClose(canClose);
+ }
+
+ if (canClose && !StringUtil.isNullOrEmpty(appPageNotification.getContentUrl())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴鍜屽厑璁稿叧闂笉鍙悓鏃跺瓨鍦�"));
+ return;
+ }
+
+ if (!canClose && StringUtil.isNullOrEmpty(appPageNotification.getContentUrl())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴涓嶈兘涓虹┖"));
+ return;
+ }
+
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String beginTimeVO = appPageNotification.getBeginTimeVO();
@@ -127,9 +170,12 @@
}
appPageNotification.setMd5(StringUtil.Md5(type.name() + "#" + content + "#" + appPageNotification.getContentUrl()));
- appPageNotification.setId(old.getId());
appPageNotification.setUpdateTime(new Date());
- appPageNotificationService.updateByPrimaryKeySelective(appPageNotification);
+
+ appPageNotification.setId(old.getId());
+ appPageNotification.setType(old.getType());
+ appPageNotification.setCreateTime(old.getCreateTime());
+ appPageNotificationService.updateByPrimaryKey(appPageNotification);
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("淇敼鎴愬姛"));
@@ -237,16 +283,29 @@
}
Boolean canClose = resultObj.getCanClose();
- if (canClose) {
- resultObj.setCanClose(false);
+ if (canClose != null && canClose) {
+ canClose = false;
} else {
- resultObj.setCanClose(true);
+ canClose = true;
}
-
- appPageNotificationService.updateByPrimaryKeySelective(resultObj);
+
+ if (canClose && !StringUtil.isNullOrEmpty(resultObj.getContentUrl())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴鍜屽厑璁稿叧闂笉鍙悓鏃跺瓨鍦�"));
+ return;
+ }
+
+ if (!canClose && StringUtil.isNullOrEmpty(resultObj.getContentUrl())) {
+ JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("璺宠浆閾炬帴涓嶈兘涓虹┖"));
+ return;
+ }
+
+ AppPageNotification newOBj = new AppPageNotification();
+ newOBj.setId(resultObj.getId());
+ newOBj.setCanClose(canClose);
+ appPageNotificationService.updateByPrimaryKeySelective(newOBj);
JSONObject data = new JSONObject();
- data.put("state", resultObj.getCanClose());
+ data.put("state", newOBj.getCanClose());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
@@ -277,16 +336,19 @@
}
Boolean show = resultObj.getShow();
- if (show) {
- resultObj.setShow(false);
+ if (show != null && show) {
+ show = false;
} else {
- resultObj.setShow(true);
+ show = true;
}
-
- appPageNotificationService.updateByPrimaryKeySelective(resultObj);
+
+ AppPageNotification newOBj = new AppPageNotification();
+ newOBj.setId(resultObj.getId());
+ newOBj.setShow(show);
+ appPageNotificationService.updateByPrimaryKeySelective(newOBj);
JSONObject data = new JSONObject();
- data.put("state", resultObj.getShow());
+ data.put("state", newOBj.getShow());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
} catch (Exception e) {
--
Gitblit v1.8.0