Commit 3a51a10b by 胡涛

修改

parent c3b5c6ca
...@@ -22,12 +22,12 @@ ...@@ -22,12 +22,12 @@
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>com.yizhi</groupId> <!-- <groupId>com.yizhi</groupId>-->
<artifactId>cloud-job-api</artifactId> <!-- <artifactId>cloud-job-api</artifactId>-->
<scope>provided</scope> <!-- <scope>provided</scope>-->
<version>1.0-SNAPSHOT</version> <!-- <version>1.0-SNAPSHOT</version>-->
</dependency> <!-- </dependency>-->
<dependency> <dependency>
<groupId>com.yizhi</groupId> <groupId>com.yizhi</groupId>
...@@ -76,10 +76,16 @@ ...@@ -76,10 +76,16 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.yizhi</groupId> <groupId>com.yizhi</groupId>
<artifactId>cloud-course-studyLog-api</artifactId> <artifactId>cloud-course-study-log-api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<version>1.0-SNAPSHOT</version> <version>1.0-SNAPSHOT</version>
</dependency> </dependency>
<dependency>
<groupId>com.yizhi</groupId>
<artifactId>cloud-core</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies> </dependencies>
...@@ -96,4 +102,4 @@ ...@@ -96,4 +102,4 @@
</plugins> </plugins>
</build> </build>
</project> </project>
\ No newline at end of file
package com.yizhi.message.application.controller.util; package com.yizhi.message.application.controller.util;
import com.yizhi.application.job.remote.JobClient;
import com.yizhi.application.job.remote.vo.VmyJobVO;
import com.yizhi.message.application.constans.Constans;
import com.yizhi.util.application.date.DateUtil;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.util.Date; import java.util.Date;
@Component @Component
public class BuildJob { public class BuildJob {
//
@Autowired // @Autowired
private JobClient jobClient; // private JobClient jobClient;
private static final Logger logger = LoggerFactory.getLogger(BuildJob.class); private static final Logger logger = LoggerFactory.getLogger(BuildJob.class);
...@@ -26,43 +21,43 @@ public class BuildJob { ...@@ -26,43 +21,43 @@ public class BuildJob {
* @throws Exception * @throws Exception
*/ */
public void buildJob(String jobName,Date sendTime) throws Exception { public void buildJob(String jobName,Date sendTime) throws Exception {
VmyJobVO job = new VmyJobVO(); // VmyJobVO job = new VmyJobVO();
job.setGroup(Constans.JOBGROUP); // job.setGroup(Constans.JOBGROUP);
job.setJobName(jobName); // job.setJobName(jobName);
job.setJobClassName("com.fulan.application.handle.quartz.job.SendNewMessageJob"); // job.setJobClassName("com.fulan.application.handle.quartz.job.SendNewMessageJob");
logger.info("********************************上架消息的发送时间={},时间戳={}", // logger.info("********************************上架消息的发送时间={},时间戳={}",
sendTime, sendTime.getTime()); // sendTime, sendTime.getTime());
//
logger.info("**************************************当前系统时间={}", (new Date()).getTime()); // logger.info("**************************************当前系统时间={}", (new Date()).getTime());
String cron = DateUtil.getCron(sendTime); // String cron = DateUtil.getCron(sendTime);
logger.info("**************************************cron={}", cron); // logger.info("**************************************cron={}", cron);
String[] cronArr = cron.split(" "); // String[] cronArr = cron.split(" ");
job.setSecond(cronArr[0]); // job.setSecond(cronArr[0]);
job.setMinute(cronArr[1]); // job.setMinute(cronArr[1]);
job.setHour(cronArr[2]); // job.setHour(cronArr[2]);
job.setDay(cronArr[3]); // job.setDay(cronArr[3]);
job.setMonth(cronArr[4]); // job.setMonth(cronArr[4]);
job.setWeek(cronArr[5]); // job.setWeek(cronArr[5]);
job.setYear(cronArr[6]); // job.setYear(cronArr[6]);
jobClient.insert(job); // jobClient.insert(job);
} }
public void buildJobDefault(String jobName) throws Exception { public void buildJobDefault(String jobName) throws Exception {
VmyJobVO job = new VmyJobVO(); // VmyJobVO job = new VmyJobVO();
job.setGroup(Constans.JOBGROUP); // job.setGroup(Constans.JOBGROUP);
job.setJobName(jobName); // job.setJobName(jobName);
job.setJobClassName("com.fulan.application.handle.quartz.job.SendNewMessageJob"); // job.setJobClassName("com.fulan.application.handle.quartz.job.SendNewMessageJob");
//
logger.info("**************************************当前系统时间={}", (new Date()).getTime()); // logger.info("**************************************当前系统时间={}", (new Date()).getTime());
//
job.setSecond("0"); // job.setSecond("0");
job.setMinute("0/5"); // job.setMinute("0/5");
job.setHour("*"); // job.setHour("*");
job.setDay("*"); // job.setDay("*");
job.setMonth("*"); // job.setMonth("*");
job.setWeek("?"); // job.setWeek("?");
job.setYear("*"); // job.setYear("*");
jobClient.insert(job); // jobClient.insert(job);
} }
} }
\ No newline at end of file
...@@ -3,7 +3,6 @@ package com.yizhi.message.application.service.impl; ...@@ -3,7 +3,6 @@ package com.yizhi.message.application.service.impl;
import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page; import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.yizhi.application.job.remote.JobClient;
import com.yizhi.application.orm.id.IdGenerator; import com.yizhi.application.orm.id.IdGenerator;
import com.yizhi.core.application.context.ContextHolder; import com.yizhi.core.application.context.ContextHolder;
import com.yizhi.core.application.context.RequestContext; import com.yizhi.core.application.context.RequestContext;
...@@ -15,9 +14,8 @@ import com.yizhi.message.application.controller.util.QueryAccount; ...@@ -15,9 +14,8 @@ import com.yizhi.message.application.controller.util.QueryAccount;
import com.yizhi.message.application.domain.*; import com.yizhi.message.application.domain.*;
import com.yizhi.message.application.enums.MessageStatus; import com.yizhi.message.application.enums.MessageStatus;
import com.yizhi.message.application.mapper.MessageMapper; import com.yizhi.message.application.mapper.MessageMapper;
import com.yizhi.message.application.vo.*;
import com.yizhi.message.application.service.*; import com.yizhi.message.application.service.*;
import com.yizhi.message.application.vo.MessageRemindVo; import com.yizhi.message.application.vo.*;
import com.yizhi.system.application.vo.AccountVO; import com.yizhi.system.application.vo.AccountVO;
import com.yizhi.system.application.vo.OrgVO; import com.yizhi.system.application.vo.OrgVO;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
...@@ -42,8 +40,7 @@ import java.util.stream.Collectors; ...@@ -42,8 +40,7 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
public class MessageServiceImple extends ServiceImpl<MessageMapper, Message> implements MessageService { public class MessageServiceImple extends ServiceImpl<MessageMapper, Message> implements MessageService {
@Autowired
private JobClient jobClient;
@Autowired @Autowired
private IdGenerator idGenerator; private IdGenerator idGenerator;
...@@ -734,4 +731,4 @@ public class MessageServiceImple extends ServiceImpl<MessageMapper, Message> imp ...@@ -734,4 +731,4 @@ public class MessageServiceImple extends ServiceImpl<MessageMapper, Message> imp
} }
return map; return map;
} }
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment