diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java index 8484f6c76..49ef01a6b 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActInfoController.java @@ -61,10 +61,7 @@ public class ActInfoController { @Autowired private ActInfoService actInfoService; - @Autowired - private ActBannerService actBannerService; - @Autowired - private JobFeignClient jobFeignClient; + @GetMapping("page") @@ -93,39 +90,8 @@ public class ActInfoController { if(SecurityUser.getDeptId() != null){ dto.setDeptId(SecurityUser.getDeptId()); } - System.out.println(dto); ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - ActBannerDTO bannerDto = new ActBannerDTO(); - actInfoService.save(dto); - //保存banner信息 - bannerDto.setActId(dto.getId()); - bannerDto.setTitle(dto.getTitle()); - bannerDto.setBannerImg(dto.getBannerUrl()); - bannerDto.setBannerType("0"); - bannerDto.setBannerPosition("0"); - bannerDto.setUrl(""); - bannerDto.setStatus(dto.getIsBanner()); - bannerDto.setStatusTime(new Date()); - bannerDto.setDeptId(dto.getDeptId()); - ValidatorUtils.validateEntity(bannerDto, AddGroup.class, DefaultGroup.class); - actBannerService.save(bannerDto); - ScheduleJobDTO jobDTO = new ScheduleJobDTO(); - jobDTO.setBeanName("AutoAuditActUserTask"); - jobDTO.setParams(dto.getId()); - jobDTO.setStatus(1); - String cron = ""; - Calendar calendar = Calendar.getInstance(); - calendar.setTime(dto.getActStartTime()); - int year = calendar.get(Calendar.YEAR); - int month = calendar.get(Calendar.MONTH); - int day = calendar.get(Calendar.DATE); - int hours = calendar.get(Calendar.HOUR_OF_DAY); - int minutes = calendar.get(Calendar.MINUTE); - cron = "0 "+ minutes +" "+ hours + " " + day + " " + month + " ? " + year + "-" + year; - jobDTO.setCronExpression(cron); - System.out.println(cron); - System.out.println(jobDTO); - return jobFeignClient.save(jobDTO); + return actInfoService.save(dto); } @PutMapping diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java index 06a091ed9..be4731bc3 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActInfoService.java @@ -122,7 +122,7 @@ public interface ActInfoService extends BaseService { * @author generator * @date 2019-12-11 */ - void save(ActInfoDTO dto); + Result save(ActInfoDTO dto); /** * 默认更新 diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index a83cef94e..d959ea33b 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.activity.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.activity.ActInfoDTO; import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; import com.elink.esua.epdc.activity.form.ActInfoFormDTO; @@ -33,22 +34,25 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.constant.ActStateConstant; +import com.elink.esua.epdc.dto.ScheduleJobDTO; import com.elink.esua.epdc.modules.activity.dao.ActInfoDao; import com.elink.esua.epdc.modules.activity.entity.ActInfoEntity; import com.elink.esua.epdc.modules.activity.redis.ActInfoRedis; +import com.elink.esua.epdc.modules.activity.service.ActBannerService; import com.elink.esua.epdc.modules.activity.service.ActInfoService; +import com.elink.esua.epdc.modules.feign.JobFeignClient; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 活动信息表 @@ -61,6 +65,10 @@ public class ActInfoServiceImpl extends BaseServiceImpl page(Map params) { @@ -101,9 +109,40 @@ public class ActInfoServiceImpl extends BaseServiceImpl