From f276a5a1fc38e735499aa95089ff8105bd2ba196 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期五, 24 四月 2020 16:25:53 +0800
Subject: [PATCH] 状态切换
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/AppPageNotificationAdminController.java | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 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 ebe3bb9..a9525f1 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
@@ -20,13 +20,11 @@
import com.yeshi.fanli.entity.bus.help.AppPageNotification;
import com.yeshi.fanli.entity.bus.help.AppPageNotification.AppPageNotificationTypeEnum;
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl;
-import com.yeshi.fanli.entity.bus.homemodule.FloatAD;
import com.yeshi.fanli.entity.bus.homemodule.AdActivityVersionControl.AdActivityType;
import com.yeshi.fanli.service.inter.config.AppVersionService;
import com.yeshi.fanli.service.inter.help.AppPageNotificationService;
import com.yeshi.fanli.service.inter.homemodule.AdActivityVersionControlService;
import com.yeshi.fanli.tag.PageEntity;
-import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
import net.sf.json.JSONArray;
@@ -131,13 +129,12 @@
@RequestMapping(value = "saveModify")
public void saveModify(String callback, AppPageNotification appPageNotification, PrintWriter out) {
try {
- AppPageNotificationTypeEnum type = appPageNotification.getType();
- if (type == null) {
+ if (appPageNotification.getId() == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
return;
}
- AppPageNotification old = appPageNotificationService.getAppPageNotificationByType(type.name());
+ AppPageNotification old = appPageNotificationService.selectByPrimaryKey(appPageNotification.getId());
if (old == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔瀵硅薄宸蹭笉瀛樺湪"));
return;
@@ -183,7 +180,7 @@
appPageNotification.setEndTime(format.parse(endTimeVO.replaceAll("T", " ")));
}
- appPageNotification.setMd5(StringUtil.Md5(type.name() + "#" + content + "#" + appPageNotification.getContentUrl()));
+ appPageNotification.setMd5(StringUtil.Md5(appPageNotification.getType() + "#" + content + "#" + appPageNotification.getContentUrl()));
appPageNotification.setUpdateTime(new Date());
appPageNotification.setId(old.getId());
@@ -233,7 +230,6 @@
for (AppPageNotification notification: list) {
AppPageNotificationTypeEnum type = notification.getType();
notification.setPageName(type.getDesc());
-
Date startTime = notification.getBeginTime();
if (startTime == null) {
@@ -318,15 +314,15 @@
* @param id
* @param out
*/
- @RequestMapping(value = "updateCanCloseState")
- public void updateCanCloseState(String callback, String type, PrintWriter out) {
+ @RequestMapping(value = "switchShutOff")
+ public void switchShutOff(String callback, Long id, PrintWriter out) {
try {
- if (type == null) {
+ if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
return;
}
- AppPageNotification resultObj = appPageNotificationService.getAppPageNotificationByType(type);
+ AppPageNotification resultObj = appPageNotificationService.selectByPrimaryKey(id);
if (resultObj == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
return;
@@ -357,7 +353,6 @@
JSONObject data = new JSONObject();
data.put("state", newOBj.getCanClose());
JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
@@ -370,16 +365,15 @@
* @param id
* @param out
*/
- @RequestMapping(value = "updateShowState")
- public void updateShowState(String callback, String type, PrintWriter out) {
+ @RequestMapping(value = "switchState")
+ public void switchState(String callback, Long id, PrintWriter out) {
try {
-
- if (type == null) {
+ if (id == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("ID涓嶈兘涓虹┖"));
return;
}
- AppPageNotification resultObj = appPageNotificationService.getAppPageNotificationByType(type);
+ AppPageNotification resultObj = appPageNotificationService.selectByPrimaryKey(id);
if (resultObj == null) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔鏁版嵁宸蹭笉瀛樺湪"));
return;
@@ -396,11 +390,7 @@
newOBj.setId(resultObj.getId());
newOBj.setShow(show);
appPageNotificationService.updateByPrimaryKeySelective(newOBj);
-
- JSONObject data = new JSONObject();
- data.put("state", newOBj.getShow());
- JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));
-
+ JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("鎿嶄綔鎴愬姛"));
} catch (Exception e) {
JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("鎿嶄綔寮傚父"));
e.printStackTrace();
--
Gitblit v1.8.0