作者 若依
提交者 Gitee

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

Merge pull request !234 from xivLi/master
1 package com.ruoyi.common.utils.uuid; 1 package com.ruoyi.common.utils.uuid;
2 2
3 -import com.ruoyi.common.utils.uuid.UUID;  
4 -  
5 /** 3 /**
6 * ID生成器工具类 4 * ID生成器工具类
7 * 5 *
8 * @author ruoyi 6 * @author ruoyi
9 */ 7 */
10 -public class IdUtils  
11 -{ 8 +public class IdUtils {
12 /** 9 /**
13 * 获取随机UUID 10 * 获取随机UUID
14 * 11 *
15 * @return 随机UUID 12 * @return 随机UUID
16 */ 13 */
17 - public static String randomUUID()  
18 - { 14 + public static String randomUUID() {
19 return UUID.randomUUID().toString(); 15 return UUID.randomUUID().toString();
20 } 16 }
21 17
@@ -24,8 +20,7 @@ public class IdUtils @@ -24,8 +20,7 @@ public class IdUtils
24 * 20 *
25 * @return 简化的UUID,去掉了横线 21 * @return 简化的UUID,去掉了横线
26 */ 22 */
27 - public static String simpleUUID()  
28 - { 23 + public static String simpleUUID() {
29 return UUID.randomUUID().toString(true); 24 return UUID.randomUUID().toString(true);
30 } 25 }
31 26
@@ -34,8 +29,7 @@ public class IdUtils @@ -34,8 +29,7 @@ public class IdUtils
34 * 29 *
35 * @return 随机UUID 30 * @return 随机UUID
36 */ 31 */
37 - public static String fastUUID()  
38 - { 32 + public static String fastUUID() {
39 return UUID.fastUUID().toString(); 33 return UUID.fastUUID().toString();
40 } 34 }
41 35
@@ -44,8 +38,7 @@ public class IdUtils @@ -44,8 +38,7 @@ public class IdUtils
44 * 38 *
45 * @return 简化的UUID,去掉了横线 39 * @return 简化的UUID,去掉了横线
46 */ 40 */
47 - public static String fastSimpleUUID()  
48 - { 41 + public static String fastSimpleUUID() {
49 return UUID.fastUUID().toString(true); 42 return UUID.fastUUID().toString(true);
50 } 43 }
51 } 44 }
1 package com.ruoyi.quartz.domain; 1 package com.ruoyi.quartz.domain;
2 2
3 -import java.io.Serializable;  
4 import java.util.Date; 3 import java.util.Date;
5 import javax.validation.constraints.NotBlank; 4 import javax.validation.constraints.NotBlank;
6 import javax.validation.constraints.Size; 5 import javax.validation.constraints.Size;
@@ -19,8 +18,7 @@ import com.ruoyi.quartz.util.CronUtils; @@ -19,8 +18,7 @@ import com.ruoyi.quartz.util.CronUtils;
19 * 18 *
20 * @author ruoyi 19 * @author ruoyi
21 */ 20 */
22 -public class SysJob extends BaseEntity implements Serializable  
23 -{ 21 +public class SysJob extends BaseEntity {
24 private static final long serialVersionUID = 1L; 22 private static final long serialVersionUID = 1L;
25 23
26 /** 任务ID */ 24 /** 任务ID */
@@ -55,118 +53,92 @@ public class SysJob extends BaseEntity implements Serializable @@ -55,118 +53,92 @@ public class SysJob extends BaseEntity implements Serializable
55 @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停") 53 @Excel(name = "任务状态", readConverterExp = "0=正常,1=暂停")
56 private String status; 54 private String status;
57 55
58 - public Long getJobId()  
59 - { 56 + public Long getJobId() {
60 return jobId; 57 return jobId;
61 } 58 }
62 59
63 - public void setJobId(Long jobId)  
64 - { 60 + public void setJobId(Long jobId) {
65 this.jobId = jobId; 61 this.jobId = jobId;
66 } 62 }
67 63
68 @NotBlank(message = "任务名称不能为空") 64 @NotBlank(message = "任务名称不能为空")
69 @Size(min = 0, max = 64, message = "任务名称不能超过64个字符") 65 @Size(min = 0, max = 64, message = "任务名称不能超过64个字符")
70 - public String getJobName()  
71 - { 66 + public String getJobName() {
72 return jobName; 67 return jobName;
73 } 68 }
74 69
75 - public void setJobName(String jobName)  
76 - { 70 + public void setJobName(String jobName) {
77 this.jobName = jobName; 71 this.jobName = jobName;
78 } 72 }
79 73
80 - public String getJobGroup()  
81 - { 74 + public String getJobGroup() {
82 return jobGroup; 75 return jobGroup;
83 } 76 }
84 77
85 - public void setJobGroup(String jobGroup)  
86 - { 78 + public void setJobGroup(String jobGroup) {
87 this.jobGroup = jobGroup; 79 this.jobGroup = jobGroup;
88 } 80 }
89 81
90 @NotBlank(message = "调用目标字符串不能为空") 82 @NotBlank(message = "调用目标字符串不能为空")
91 @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符") 83 @Size(min = 0, max = 500, message = "调用目标字符串长度不能超过500个字符")
92 - public String getInvokeTarget()  
93 - { 84 + public String getInvokeTarget() {
94 return invokeTarget; 85 return invokeTarget;
95 } 86 }
96 87
97 - public void setInvokeTarget(String invokeTarget)  
98 - { 88 + public void setInvokeTarget(String invokeTarget) {
99 this.invokeTarget = invokeTarget; 89 this.invokeTarget = invokeTarget;
100 } 90 }
101 91
102 @NotBlank(message = "Cron执行表达式不能为空") 92 @NotBlank(message = "Cron执行表达式不能为空")
103 @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") 93 @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符")
104 - public String getCronExpression()  
105 - { 94 + public String getCronExpression() {
106 return cronExpression; 95 return cronExpression;
107 } 96 }
108 97
109 - public void setCronExpression(String cronExpression)  
110 - { 98 + public void setCronExpression(String cronExpression) {
111 this.cronExpression = cronExpression; 99 this.cronExpression = cronExpression;
112 } 100 }
113 101
114 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") 102 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
115 - public Date getNextValidTime()  
116 - {  
117 - if (StringUtils.isNotEmpty(cronExpression))  
118 - { 103 + public Date getNextValidTime() {
  104 + if (StringUtils.isNotEmpty(cronExpression)) {
119 return CronUtils.getNextExecution(cronExpression); 105 return CronUtils.getNextExecution(cronExpression);
120 } 106 }
121 return null; 107 return null;
122 } 108 }
123 109
124 - public String getMisfirePolicy()  
125 - { 110 + public String getMisfirePolicy() {
126 return misfirePolicy; 111 return misfirePolicy;
127 } 112 }
128 113
129 - public void setMisfirePolicy(String misfirePolicy)  
130 - { 114 + public void setMisfirePolicy(String misfirePolicy) {
131 this.misfirePolicy = misfirePolicy; 115 this.misfirePolicy = misfirePolicy;
132 } 116 }
133 117
134 - public String getConcurrent()  
135 - { 118 + public String getConcurrent() {
136 return concurrent; 119 return concurrent;
137 } 120 }
138 121
139 - public void setConcurrent(String concurrent)  
140 - { 122 + public void setConcurrent(String concurrent) {
141 this.concurrent = concurrent; 123 this.concurrent = concurrent;
142 } 124 }
143 125
144 - public String getStatus()  
145 - { 126 + public String getStatus() {
146 return status; 127 return status;
147 } 128 }
148 129
149 - public void setStatus(String status)  
150 - { 130 + public void setStatus(String status) {
151 this.status = status; 131 this.status = status;
152 } 132 }
153 133
154 @Override 134 @Override
155 public String toString() { 135 public String toString() {
156 - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)  
157 - .append("jobId", getJobId())  
158 - .append("jobName", getJobName())  
159 - .append("jobGroup", getJobGroup())  
160 - .append("cronExpression", getCronExpression())  
161 - .append("nextValidTime", getNextValidTime())  
162 - .append("misfirePolicy", getMisfirePolicy())  
163 - .append("concurrent", getConcurrent())  
164 - .append("status", getStatus())  
165 - .append("createBy", getCreateBy())  
166 - .append("createTime", getCreateTime())  
167 - .append("updateBy", getUpdateBy())  
168 - .append("updateTime", getUpdateTime())  
169 - .append("remark", getRemark())  
170 - .toString(); 136 + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("jobId", getJobId())
  137 + .append("jobName", getJobName()).append("jobGroup", getJobGroup())
  138 + .append("cronExpression", getCronExpression()).append("nextValidTime", getNextValidTime())
  139 + .append("misfirePolicy", getMisfirePolicy()).append("concurrent", getConcurrent())
  140 + .append("status", getStatus()).append("createBy", getCreateBy()).append("createTime", getCreateTime())
  141 + .append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).append("remark", getRemark())
  142 + .toString();
171 } 143 }
172 } 144 }