From 626958fafd9a4c7d7f2a0a14a09188372a8cb46d Mon Sep 17 00:00:00 2001 From: xu0625 <1212> Date: Thu, 8 Apr 2021 16:18:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86-=E6=8A=BD?= =?UTF-8?q?=E5=A5=96=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DrawInfoController.java | 89 ++++++++++++------- .../sinosoft/activity/domain/DrawInfo.java | 6 +- .../service/impl/ActConfigServiceImpl.java | 1 - .../impl/ActPageConfigGuideServiceImpl.java | 1 - .../ActPageConfigSubscribeServiceImpl.java | 1 - .../ActPageConfigUserinfoServiceImpl.java | 1 - .../templates/activity/info/add.html | 12 +-- 7 files changed, 65 insertions(+), 46 deletions(-) diff --git a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java index d966af34d..454afdc1a 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/controller/DrawInfoController.java @@ -11,9 +11,7 @@ import com.sinosoft.activity.domain.ActConfig; import com.sinosoft.activity.domain.DrawInfo; import com.sinosoft.activity.domain.DrawPrizeInfo; import com.sinosoft.activity.domain.DrawRule; -import com.sinosoft.activity.service.IDrawInfoService; -import com.sinosoft.activity.service.IDrawPrizeInfoService; -import com.sinosoft.activity.service.IDrawRuleService; +import com.sinosoft.activity.service.*; import com.sinosoft.activity.vo.ActVO; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; @@ -56,6 +54,62 @@ public class DrawInfoController extends BaseController @Autowired private IDrawRuleService iDrawRuleService; + + @Autowired + private IActConfigService iActConfigService; + + @Autowired + private IActPageConfigGuideService iActPageConfigGuideService; + + @Autowired + private IActPageConfigUserinfoService iActPageConfigUserinfoService; + + @Autowired + private IActPageConfigSubscribeService iActPageConfigSubscribeService; + + /** + * 新增保存抽奖活动管理 + */ + @RequiresPermissions("activity:info:add") + @Log(title = "抽奖活动管理", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(@RequestBody ActVO vo) + { + logger.info("前台传参"+ JSON.toJSONString(vo)); + SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssSSS"); + Date date = new Date(); + //新增基本信息 + vo.getDrawInfo().setCREATETIMESTAMP(date); + String code = format.format(date); + vo.getDrawInfo().setDRAWCODE(code); + drawInfoService.insertDrawInfo(vo.getDrawInfo()); + + //新增展示内容 + vo.getActPageConfigGuide().setCreateTime(date); + vo.getActPageConfigGuide().setActCode(code); + iActPageConfigGuideService.insertActPageConfigGuide(vo.getActPageConfigGuide()); + + //新增选择玩法 + vo.getDrawRule().setCREATETIMESTAMP(date); + vo.getDrawRule().setDRAWCODE(code); + iDrawRuleService.insertDrawRule(vo.getDrawRule()); + + //新增收集信息 + vo.getActPageConfigUserinfo().setCreateTime(date); + vo.getActPageConfigUserinfo().setActCode(code); + iActPageConfigUserinfoService.insertActPageConfigUserinfo(vo.getActPageConfigUserinfo()); + + //新增分享信息 + vo.getActConfig().setCreateTime(date); + vo.getActConfig().setActCode(code); + iActConfigService.insertActConfig(vo.getActConfig()); + //新增二维码信息 + vo.getActPageConfigSubscribe().setCreateTime(date); + vo.getActPageConfigSubscribe().setActCode(code); + int i = iActPageConfigSubscribeService.insertActPageConfigSubscribe(vo.getActPageConfigSubscribe()); + return toAjax(i); + } /** * 查询抽奖活动管理列表 */ @@ -92,35 +146,6 @@ public class DrawInfoController extends BaseController return prefix + "/add"; } - /** - * 新增保存抽奖活动管理 - */ - @RequiresPermissions("activity:info:add") - @Log(title = "抽奖活动管理", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(DrawInfo drawInfo) - { - logger.info("前台传参"+ JSON.toJSONString(drawInfo)); - SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHHmmssSSS"); - Date date = new Date(); - drawInfo.setCREATETIMESTAMP(date); - String format1 = format.format(date); - drawInfo.setDRAWCODE(format1); - drawInfoService.insertDrawInfo(drawInfo); - DrawRule drawRule = new DrawRule(); - BeanUtils.copyProperties(drawInfo,drawRule); - logger.info("接口新增"+ JSON.toJSONString(drawRule)); - int i = iDrawRuleService.insertDrawRule(drawRule); - return toAjax(i); - } - - @PostMapping("/add/test") - @ResponseBody - public AjaxResult addtest(@RequestBody ActVO vo){ - ActConfig actConfig = vo.getActConfig(); - return null; - } /** diff --git a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java index 6d6f019fc..163dd111e 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/domain/DrawInfo.java @@ -2,15 +2,17 @@ package com.sinosoft.activity.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + import java.util.Date; /** * 抽奖活动管理对象 draw_info * - * @author ruoyi + * @author xlh * @date 2021-03-25 */ -public class DrawInfo extends DrawRule +public class DrawInfo extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java index a6af57899..6cbe45e2a 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActConfigServiceImpl.java @@ -54,7 +54,6 @@ public class ActConfigServiceImpl implements IActConfigService @Override public int insertActConfig(ActConfig actConfig) { - actConfig.setCreateTime(DateUtils.getNowDate()); return actConfigMapper.insertActConfig(actConfig); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigGuideServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigGuideServiceImpl.java index 7dcbe6624..e4b6e19cb 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigGuideServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigGuideServiceImpl.java @@ -54,7 +54,6 @@ public class ActPageConfigGuideServiceImpl implements IActPageConfigGuideService @Override public int insertActPageConfigGuide(ActPageConfigGuide actPageConfigGuide) { - actPageConfigGuide.setCreateTime(DateUtils.getNowDate()); return actPageConfigGuideMapper.insertActPageConfigGuide(actPageConfigGuide); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java index 45c62dd27..612a13e9b 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigSubscribeServiceImpl.java @@ -54,7 +54,6 @@ public class ActPageConfigSubscribeServiceImpl implements IActPageConfigSubscrib @Override public int insertActPageConfigSubscribe(ActPageConfigSubscribe actPageConfigSubscribe) { - actPageConfigSubscribe.setCreateTime(DateUtils.getNowDate()); return actPageConfigSubscribeMapper.insertActPageConfigSubscribe(actPageConfigSubscribe); } diff --git a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java index d68fd8f72..b139ac94a 100644 --- a/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java +++ b/sino-activity/src/main/java/com/sinosoft/activity/service/impl/ActPageConfigUserinfoServiceImpl.java @@ -54,7 +54,6 @@ public class ActPageConfigUserinfoServiceImpl implements IActPageConfigUserinfoS @Override public int insertActPageConfigUserinfo(ActPageConfigUserinfo actPageConfigUserinfo) { - actPageConfigUserinfo.setCreateTime(DateUtils.getNowDate()); return actPageConfigUserinfoMapper.insertActPageConfigUserinfo(actPageConfigUserinfo); } diff --git a/sino-activity/src/main/resources/templates/activity/info/add.html b/sino-activity/src/main/resources/templates/activity/info/add.html index 01d823d78..b6ed2c3de 100644 --- a/sino-activity/src/main/resources/templates/activity/info/add.html +++ b/sino-activity/src/main/resources/templates/activity/info/add.html @@ -887,10 +887,6 @@ }); - function submitHandler() { - var data = $("#form-info-add").serializeArray(); - $.operate.saveModal(prefix + "/add", data); - } //时间段抽奖配置 function dailyflag() { @@ -930,7 +926,7 @@ } - $("input[name='STARTTIME']").datetimepicker({ + $("input[name='drawInfo-STARTTIME']").datetimepicker({ weekStart: 1, todayBtn: 1, autoclose: 1, @@ -941,7 +937,7 @@ format: 'yyyy-mm-dd hh:ii:ss' }); - $("input[name='ENDTIME']").datetimepicker({ + $("input[name='drawInfo-ENDTIME']").datetimepicker({ weekStart: 1, todayBtn: 1, autoclose: 1, @@ -952,7 +948,7 @@ format: 'yyyy-mm-dd hh:ii:ss' }); - $("input[name='DAILYSTARTTIME']").datetimepicker({ + $("input[name='drawRule-DAILYSTARTTIME']").datetimepicker({ weekStart: 1, todayBtn: 1, autoclose: 1, @@ -963,7 +959,7 @@ format: 'hh:ii:ss' }); - $("input[name='DAILYENDTIME']").datetimepicker({ + $("input[name='drawRule-DAILYENDTIME']").datetimepicker({ weekStart: 1, todayBtn: 1, autoclose: 1,