修改代码

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/QuartzService.java

@@ -141,7 +141,7 @@ public class QuartzService extends BaseService {
     Pageable pageable = PageRequest.of(page - 1, size); //页码：前端从1开始，jpa从0开始，做个转换
     Page pageUser = quartzRepository.findAll(specification, pageable);
     List<Quartz> quartzs = pageUser.getContent();// 结果集
-    if (null != quartzs && quartzs.size() > 0) {
+    if ( quartzs.size() > 0) {
       for (Quartz quartz : quartzs) {
         quartz.setJobState(getJobStatus(quartz.getJobName()));
         quartz.setLaetFireTime(getJobPreviousFireTime(quartz.getJobName()));
@@ -156,7 +156,7 @@ public class QuartzService extends BaseService {
   @Transactional(propagation = Propagation.NOT_SUPPORTED, readOnly = true)
   public List<Quartz> getAll() throws SchedulerException {
     List<Quartz> quartzs = quartzRepository.findAll();
-    if (null != quartzs && quartzs.size() > 0) {
+    if (quartzs.size() > 0) {
       for (Quartz quartz : quartzs) {
         quartz.setJobState(getJobStatus(quartz.getJobName()));
         quartz.setLaetFireTime(getJobPreviousFireTime(quartz.getJobName()));
@@ -191,7 +191,7 @@ public class QuartzService extends BaseService {
 
       Class c = Class.forName(quartz.getExecuteClass());
       c.newInstance();
-      if (quartz.getCronExpression().indexOf(" ") != -1) {
+      if (quartz.getCronExpression().indexOf(' ') != -1) {
         scheduleJob(c, quartz.getJobName(), quartz.getStartTime(), quartz.getCronExpression(), null);
       } else {
         scheduleJob(c, quartz.getJobName(), quartz.getStartTime(),
@@ -224,13 +224,8 @@ public class QuartzService extends BaseService {
     Connection connection = null;
 
     try {
-      String driverClassName = this.driverClassName;
-      String url = this.url;
-      String username = this.username;
-      String password = this.password;
-
-      Class.forName(driverClassName);
-      connection = DriverManager.getConnection(url, username, password);
+      Class.forName(this.driverClassName);
+      connection = DriverManager.getConnection(this.url, this.username, this.password);
 
       ClassPathResource rc = new ClassPathResource("sql/jobload/E63_JOB.sql");
       EncodedResource er = new EncodedResource(rc, "utf-8");