!234 【轻量级 PR】：删去两处冗余代码

Merge pull request !234 from xivLi/master

ruoyi-common/src/main/java/com/ruoyi/common/utils/uuid/IdUtils.java

@@ -1,21 +1,17 @@
 package com.ruoyi.common.utils.uuid;
 
-import com.ruoyi.common.utils.uuid.UUID;
-
 /**
  * ID生成器工具类
  * 
  * @author ruoyi
  */
-public class IdUtils
+public class IdUtils {
-{
     /**
      * 获取随机UUID
      * 
      * @return 随机UUID
      */
-    public static String randomUUID()
+    public static String randomUUID() {
-    {
         return UUID.randomUUID().toString();
     }
 
@@ -24,8 +20,7 @@ public class IdUtils
      * 
      * @return 简化的UUID，去掉了横线
      */
-    public static String simpleUUID()
+    public static String simpleUUID() {
-    {
         return UUID.randomUUID().toString(true);
     }
 
@@ -34,8 +29,7 @@ public class IdUtils
      * 
      * @return 随机UUID
      */
-    public static String fastUUID()
+    public static String fastUUID() {
-    {
         return UUID.fastUUID().toString();
     }
 
@@ -44,8 +38,7 @@ public class IdUtils
      * 
      * @return 简化的UUID，去掉了横线
      */
-    public static String fastSimpleUUID()
+    public static String fastSimpleUUID() {
-    {
         return UUID.fastUUID().toString(true);
     }
 }

ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java

@@ -1,6 +1,5 @@
 package com.ruoyi.quartz.domain;
 
-import java.io.Serializable;
 import java.util.Date;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Size;
@@ -19,8 +18,7 @@ import com.ruoyi.quartz.util.CronUtils;
  * 
  * @author ruoyi
  */
-public class SysJob extends BaseEntity implements Serializable
+public class SysJob extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
     /** 任务ID */
@@ -55,118 +53,92 @@ public class SysJob extends BaseEntity implements Serializable
     @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
     private String status;
 
-    public Long getJobId()
+    public Long getJobId() {
-    {
         return jobId;
     }
 
-    public void setJobId(Long jobId)
+    public void setJobId(Long jobId) {
-    {
         this.jobId = jobId;
     }
 
     @NotBlank(message = "任务名称不能为空")
     @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
-    public String getJobName()
+    public String getJobName() {
-    {
         return jobName;
     }
 
-    public void setJobName(String jobName)
+    public void setJobName(String jobName) {
-    {
         this.jobName = jobName;
     }
 
-    public String getJobGroup()
+    public String getJobGroup() {
-    {
         return jobGroup;
     }
 
-    public void setJobGroup(String jobGroup)
+    public void setJobGroup(String jobGroup) {
-    {
         this.jobGroup = jobGroup;
     }
 
     @NotBlank(message = "调用目标字符串不能为空")
     @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
-    public String getInvokeTarget()
+    public String getInvokeTarget() {
-    {
         return invokeTarget;
     }
 
-    public void setInvokeTarget(String invokeTarget)
+    public void setInvokeTarget(String invokeTarget) {
-    {
         this.invokeTarget = invokeTarget;
     }
 
     @NotBlank(message = "Cron执行表达式不能为空")
     @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
-    public String getCronExpression()
+    public String getCronExpression() {
-    {
         return cronExpression;
     }
 
-    public void setCronExpression(String cronExpression)
+    public void setCronExpression(String cronExpression) {
-    {
         this.cronExpression = cronExpression;
     }
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    public Date getNextValidTime()
+    public Date getNextValidTime() {
-    {
+        if (StringUtils.isNotEmpty(cronExpression)) {
-        if (StringUtils.isNotEmpty(cronExpression))
-        {
             return CronUtils.getNextExecution(cronExpression);
         }
         return null;
     }
 
-    public String getMisfirePolicy()
+    public String getMisfirePolicy() {
-    {
         return misfirePolicy;
     }
 
-    public void setMisfirePolicy(String misfirePolicy)
+    public void setMisfirePolicy(String misfirePolicy) {
-    {
         this.misfirePolicy = misfirePolicy;
     }
 
-    public String getConcurrent()
+    public String getConcurrent() {
-    {
         return concurrent;
     }
 
-    public void setConcurrent(String concurrent)
+    public void setConcurrent(String concurrent) {
-    {
         this.concurrent = concurrent;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("jobId", getJobId())
-            .append("jobId", getJobId())
+                .append("jobName", getJobName()).append("jobGroup", getJobGroup())
-            .append("jobName", getJobName())
+                .append("cronExpression", getCronExpression()).append("nextValidTime", getNextValidTime())
-            .append("jobGroup", getJobGroup())
+                .append("misfirePolicy", getMisfirePolicy()).append("concurrent", getConcurrent())
-            .append("cronExpression", getCronExpression())
+                .append("status", getStatus()).append("createBy", getCreateBy()).append("createTime", getCreateTime())
-            .append("nextValidTime", getNextValidTime())
+                .append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark())
-            .append("misfirePolicy", getMisfirePolicy())
+                .toString();
-            .append("concurrent", getConcurrent())
-            .append("status", getStatus())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
     }
 }