From 69bee82b81626b82b7f39f0e459e4f56b1699b51 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 三月 2019 12:02:16 +0800
Subject: [PATCH] 正式数据库修改
---
fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java | 46 ++++++++++------------------------------------
1 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
index 805774e..ed1ff94 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/admin/homemodule/SwiperBannerAdminController.java
@@ -6,8 +6,6 @@
import java.util.List;
import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
@@ -22,7 +20,6 @@
import com.google.gson.reflect.TypeToken;
import com.yeshi.fanli.entity.bus.homemodule.SwiperBanner;
import com.yeshi.fanli.entity.bus.homemodule.SwiperPicture;
-import com.yeshi.fanli.entity.common.AdminUser;
import com.yeshi.fanli.entity.common.JumpDetailV2;
import com.yeshi.fanli.exception.banner.SwiperBannerException;
import com.yeshi.fanli.exception.banner.SwiperPictureException;
@@ -34,7 +31,6 @@
import com.yeshi.fanli.tag.PageEntity;
import com.yeshi.fanli.util.Constant;
import com.yeshi.fanli.util.StringUtil;
-import com.yeshi.fanli.util.annotation.RequestNoLogin;
/**
* 杞挱鍥剧鐞�
@@ -164,10 +160,10 @@
}
Integer state = resultObj.getState();
- if (state != null && state.equals(0)) {
- resultObj.setState(1);
- } else {
+ if (state == null || state.equals(1) || state == 1) {
resultObj.setState(0);
+ } else {
+ resultObj.setState(1);
}
swiperBannerService.updateByPrimaryKeySelective(resultObj);
@@ -366,20 +362,10 @@
* @param response
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "uploadPicture")
public void uploadPicture(@RequestParam("file") CommonsMultipartFile file, Long uid,
- SwiperPicture record, HttpServletRequest request, HttpServletResponse response, PrintWriter out) {
+ SwiperPicture record, PrintWriter out) {
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
- AdminUser admin = adminUserService.selectByPrimaryKey(uid);
-
- if (admin == null) {
- out.print(JsonUtil.loadFalseResult("褰撳墠璐︽埛楠岃瘉澶辫触"));
- return;
- }
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
@@ -396,7 +382,7 @@
int maxOrder = swiperPictureService.getMaxOrderByBannerID(bannerId);
record.setOrder(maxOrder + 1);
-
+ // 榛樿鍋滅敤
record.setState(1);
record.setCreatetime(new Date());
record.setUpdatetime(new Date());
@@ -436,20 +422,9 @@
* @param response
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "changePicture")
- public void changePicture(@RequestParam("file") CommonsMultipartFile file, Long uid,
- Long id, HttpServletRequest request, HttpServletResponse response, PrintWriter out) {
-
- response.setHeader("Access-Control-Allow-Origin", "*");
- response.setHeader("Access-Control-Allow-Methods", "*");
-
- AdminUser admin = adminUserService.selectByPrimaryKey(uid);
-
- if (admin == null) {
- out.print(JsonUtil.loadFalseResult("褰撳墠璐︽埛楠岃瘉澶辫触"));
- return;
- }
+ public void changePicture(@RequestParam("file") CommonsMultipartFile file, Long uid, Long id,
+ PrintWriter out) {
if (file == null) {
out.print(JsonUtil.loadFalseResult("涓婁紶鏂囦欢涓虹┖"));
@@ -484,7 +459,6 @@
* @param record
* @param out
*/
- @RequestNoLogin()
@RequestMapping(value = "changePicInfo")
public void changePicInfo(String callback, SwiperPicture record, String jumpType,
PrintWriter out) {
@@ -596,10 +570,10 @@
}
Integer state = resultObj.getState();
- if (state != null && state.equals(0)) {
- resultObj.setState(1);
- } else {
+ if (state == null || state.equals(1) || state == 1) {
resultObj.setState(0);
+ } else {
+ resultObj.setState(1);
}
swiperPictureService.updateByPrimaryKeySelective(resultObj);
--
Gitblit v1.8.0