From 171a706099da6bd039b31b7a94eb75fb9b6162d2 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 25 Aug 2021 14:49:56 +0800 Subject: [PATCH] 20210825 --- gc-sys/src/main/java/com/xzx/gc/system/controller/AdminBannerController.java | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/gc-sys/src/main/java/com/xzx/gc/system/controller/AdminBannerController.java b/gc-sys/src/main/java/com/xzx/gc/system/controller/AdminBannerController.java index bf1d9a1..292bb97 100644 --- a/gc-sys/src/main/java/com/xzx/gc/system/controller/AdminBannerController.java +++ b/gc-sys/src/main/java/com/xzx/gc/system/controller/AdminBannerController.java @@ -1,11 +1,15 @@ package com.xzx.gc.system.controller; +import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import com.xzx.gc.common.constant.CommonEnum; import com.xzx.gc.common.constant.Constants; import com.xzx.gc.common.dto.log.OperationAppLog; import com.xzx.gc.common.request.BaseController; import com.xzx.gc.entity.BannerInfo; +import com.xzx.gc.entity.SysPopup; import com.xzx.gc.model.JsonResult; import com.xzx.gc.system.dto.*; import com.xzx.gc.system.mapper.BannerMapper; @@ -25,7 +29,10 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; import java.util.Map; @RestController @@ -105,6 +112,19 @@ if(ObjectUtil.isEmpty(sysPopupListVo)){ return JsonResult.failMessage("当前记录不存在!"); } + Integer state = model.getStatus(); + String startTime = sysPopupListVo.getStartTime(); + String endTime = sysPopupListVo.getEndTime(); + + DateTime dateTime = DateUtil.parseDate(endTime); + int compare = DateUtil.compare(DateUtil.date(), dateTime); + if(1 == state && compare > 0){ + return JsonResult.failMessage("首页弹窗已过期!"); + } + List<SysPopup> sysPopups = bannerMapper.selectSysPopupBystate(1,startTime,endTime); + if(1 == state && CollUtil.isNotEmpty(sysPopups)){ + return JsonResult.failMessage("当前时间段已有上架首页弹窗!"); + } bannerService.onOffSysPopup(model); OperationAppLog build = OperationAppLog.builder().appPrograme(CommonEnum.后台.getValue()).opreateName(getAdminName(request)) .methodName(Constants.SCORESHOP_MODUL_NAME).operateAction("首页弹窗--上下架-" + id).build(); -- Gitblit v1.9.1