From 38ac3edec220a57026141ca08128518a65751c9a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 六月 2023 18:13:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBroadcastController.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBroadcastController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBroadcastController.java
index 3b9f7dd..c22b732 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBroadcastController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TBroadcastController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.stylefeng.guns.core.base.controller.BaseController;
+import com.stylefeng.guns.core.base.tips.SuccessTip;
import com.stylefeng.guns.core.util.DateUtil;
import com.stylefeng.guns.modular.system.enums.StatusEnum;
import com.stylefeng.guns.modular.system.model.TSystemBulletin;
@@ -75,8 +76,8 @@
}
if(StringUtils.hasLength(createTime)){
String[] split = createTime.split(" - ");
- Date startTime = DateUtil.getDate_str4(split[0]);
- Date endTime = DateUtil.getDate_str4(split[1]);
+ Date startTime = DateUtil.getDate_str3(split[0]+" 00:00:00");
+ Date endTime = DateUtil.getDate_str3(split[1]+" 23:59:59");
wrapper.between("createTime",startTime,endTime);
}
wrapper.ne("status", StatusEnum.DELETE.getCode());
@@ -98,6 +99,12 @@
@RequestMapping(value = "/add")
@ResponseBody
public Object add(TBroadcast tBroadcast) {
+ Boolean exit = tBroadcastService.isExit(tBroadcast.getId(), tBroadcast.getSort());
+ if(exit){
+ return new SuccessTip(500,"该排序已存在!");
+ }
+ tBroadcast.setStatus(StatusEnum.NORMAL.getCode());
+ tBroadcast.setCreateTime(new Date());
tBroadcastService.insert(tBroadcast);
return SUCCESS_TIP;
}
@@ -109,6 +116,9 @@
@ResponseBody
public Object delete(@RequestParam Integer tBroadcastId) {
TBroadcast tBroadcast = tBroadcastService.selectById(tBroadcastId);
+ if(1 == tBroadcast.getUpDown()){
+ return new SuccessTip(500,"上架中的广播不可删除!");
+ }
tBroadcast.setStatus(StatusEnum.DELETE.getCode());
tBroadcastService.updateById(tBroadcast);
return SUCCESS_TIP;
@@ -120,6 +130,41 @@
@RequestMapping(value = "/update")
@ResponseBody
public Object update(TBroadcast tBroadcast) {
+ Boolean exit = tBroadcastService.isExit(tBroadcast.getId(), tBroadcast.getSort());
+ if(exit){
+ return new SuccessTip(500,"该排序已存在!");
+ }
+ tBroadcastService.updateById(tBroadcast);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 上架
+ */
+ @RequestMapping(value = "/up")
+ @ResponseBody
+ public Object up(Integer id) {
+
+ int count = tBroadcastService.selectCount(new EntityWrapper<TBroadcast>()
+ .eq("upDown", 1)
+ .ne("status", StatusEnum.DELETE.getCode()));
+ if(count>4){
+ return new SuccessTip(500,"最多可上架5条广播!");
+ }
+ TBroadcast tBroadcast = tBroadcastService.selectById(id);
+ tBroadcast.setUpDown(1);
+ tBroadcastService.updateById(tBroadcast);
+ return SUCCESS_TIP;
+ }
+
+ /**
+ * 下架
+ */
+ @RequestMapping(value = "/down")
+ @ResponseBody
+ public Object down(Integer id) {
+ TBroadcast tBroadcast = tBroadcastService.selectById(id);
+ tBroadcast.setUpDown(2);
tBroadcastService.updateById(tBroadcast);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1