OSDN > Developer > t_nakayama1971 > Chamber > ThoughtBase > Commit

ThoughtBase

(Original repository, No fork origin)

R/O
SSH
HTTPS

Commit

Commit MetaInfo

Revision	2443 (tree)
Time	2022-10-08 19:16:08
Author	t_nakayama1971

Log Message

(empty log message)

Change Summary

modified: trunk/framework/pjDb/src/main/java/project/db/model/FwJobBase.java (diff)
modified: trunk/framework/pjDb/src/main/java/project/db/model/FwJobDetail.java (diff)
modified: trunk/framework/pjDb/src/main/java/project/db/model/FwJobDetailId.java (diff)
modified: trunk/framework/pjDb/src/main/java/project/db/model/FwJobFile.java (diff)
modified: trunk/framework/pjDb/src/main/java/project/db/model/FwJobFileId.java (diff)
modified: trunk/framework/pjDb/src/main/java/project/db/model/FwJobRepeat.java (diff)

Incremental Difference

--- trunk/framework/pjDb/src/main/java/project/db/model/FwJobBase.java (revision 2442)

+++ trunk/framework/pjDb/src/main/java/project/db/model/FwJobBase.java (revision 2443)

		@@ -1,153 +1,149 @@
1	1	package project.db.model;
2	2
3		-import java.util.Date;
	3	+import jakarta.persistence.Column;
	4	+import jakarta.persistence.Entity;
	5	+import jakarta.persistence.Id;
	6	+import jakarta.persistence.Table;
	7	+import java.sql.Timestamp;
4	8
5		-import jakarta.persistence.Column;
6		-import jakarta.persistence.Entity;
7		-import jakarta.persistence.Id;
8		-import jakarta.persistence.Table;
9		-import jakarta.persistence.Temporal;
10		-import jakarta.persistence.TemporalType;
11		-
12	9	/**
13	10	* FwJobBase generated by hbm2java
14	11	*/
15	12	@org.hibernate.annotations.DynamicInsert
16	13	@Entity
17		-@Table(name = "fw_job_base")
	14	+@Table(name = "fw_job_base"
	15	+)
18	16	public class FwJobBase implements java.io.Serializable {
19	17
20		- private long jobSeq;
21		- private String jobId;
22		- private String jobName;
23		- private String entryUserId;
24		- private Date entryDateTime;
25		- private String entryIp;
26		- private String jobParam;
27		- private String batParam;
28		- private String dispParam;
29		- private String execHost;
30		- private int status;
31		- private String message;
32		- private String remark;
	18	+ private long jobSeq;
	19	+ private String jobId;
	20	+ private String jobName;
	21	+ private String entryUserId;
	22	+ private Timestamp entryDateTime;
	23	+ private String entryIp;
	24	+ private String jobParam;
	25	+ private String batParam;
	26	+ private String dispParam;
	27	+ private String execHost;
	28	+ private int status;
	29	+ private String message;
	30	+ private String remark;
33	31
34		- @Id
35		- @Column(name = "job_seq", unique = true, nullable = false)
36		- public long getJobSeq() {
37		- return this.jobSeq;
38		- }
	32	+ @Id
	33	+ @Column(name = "job_seq", unique = true, nullable = false)
	34	+ public long getJobSeq() {
	35	+ return this.jobSeq;
	36	+ }
39	37
40		- public void setJobSeq(long jobSeq) {
41		- this.jobSeq = jobSeq;
42		- }
	38	+ public void setJobSeq(long jobSeq) {
	39	+ this.jobSeq = jobSeq;
	40	+ }
43	41
44		- @Column(name = "job_id", nullable = false, length = 32)
45		- public String getJobId() {
46		- return this.jobId;
47		- }
	42	+ @Column(name = "job_id", nullable = false, length = 32)
	43	+ public String getJobId() {
	44	+ return this.jobId;
	45	+ }
48	46
49		- public void setJobId(String jobId) {
50		- this.jobId = jobId;
51		- }
	47	+ public void setJobId(String jobId) {
	48	+ this.jobId = jobId;
	49	+ }
52	50
53		- @Column(name = "job_name", nullable = false, length = 128)
54		- public String getJobName() {
55		- return this.jobName;
56		- }
	51	+ @Column(name = "job_name", nullable = false, length = 128)
	52	+ public String getJobName() {
	53	+ return this.jobName;
	54	+ }
57	55
58		- public void setJobName(String jobName) {
59		- this.jobName = jobName;
60		- }
	56	+ public void setJobName(String jobName) {
	57	+ this.jobName = jobName;
	58	+ }
61	59
62		- @Column(name = "entry_user_id", nullable = false, length = 64)
63		- public String getEntryUserId() {
64		- return this.entryUserId;
65		- }
	60	+ @Column(name = "entry_user_id", nullable = false, length = 64)
	61	+ public String getEntryUserId() {
	62	+ return this.entryUserId;
	63	+ }
66	64
67		- public void setEntryUserId(String entryUserId) {
68		- this.entryUserId = entryUserId;
69		- }
	65	+ public void setEntryUserId(String entryUserId) {
	66	+ this.entryUserId = entryUserId;
	67	+ }
70	68
71		- @Temporal(TemporalType.TIMESTAMP)
72		- @Column(name = "entry_date_time", nullable = false, length = 29)
73		- public Date getEntryDateTime() {
74		- return this.entryDateTime;
75		- }
	69	+ @Column(name = "entry_date_time", nullable = false, length = 29)
	70	+ public Timestamp getEntryDateTime() {
	71	+ return this.entryDateTime;
	72	+ }
76	73
77		- public void setEntryDateTime(Date entryDateTime) {
78		- this.entryDateTime = entryDateTime;
79		- }
	74	+ public void setEntryDateTime(Timestamp entryDateTime) {
	75	+ this.entryDateTime = entryDateTime;
	76	+ }
80	77
81		- @Column(name = "entry_ip", length = 64)
82		- public String getEntryIp() {
83		- return this.entryIp;
84		- }
	78	+ @Column(name = "entry_ip", length = 64)
	79	+ public String getEntryIp() {
	80	+ return this.entryIp;
	81	+ }
85	82
86		- public void setEntryIp(String entryIp) {
87		- this.entryIp = entryIp;
88		- }
	83	+ public void setEntryIp(String entryIp) {
	84	+ this.entryIp = entryIp;
	85	+ }
89	86
90		- @Column(name = "job_param", length = 128)
91		- public String getJobParam() {
92		- return this.jobParam;
93		- }
	87	+ @Column(name = "job_param", length = 128)
	88	+ public String getJobParam() {
	89	+ return this.jobParam;
	90	+ }
94	91
95		- public void setJobParam(String jobParam) {
96		- this.jobParam = jobParam;
97		- }
	92	+ public void setJobParam(String jobParam) {
	93	+ this.jobParam = jobParam;
	94	+ }
98	95
99		- @Column(name = "bat_param", length = 512)
100		- public String getBatParam() {
101		- return this.batParam;
102		- }
	96	+ @Column(name = "bat_param", length = 512)
	97	+ public String getBatParam() {
	98	+ return this.batParam;
	99	+ }
103	100
104		- public void setBatParam(String batParam) {
105		- this.batParam = batParam;
106		- }
	101	+ public void setBatParam(String batParam) {
	102	+ this.batParam = batParam;
	103	+ }
107	104
108		- @Column(name = "disp_param", length = 512)
109		- public String getDispParam() {
110		- return this.dispParam;
111		- }
	105	+ @Column(name = "disp_param", length = 512)
	106	+ public String getDispParam() {
	107	+ return this.dispParam;
	108	+ }
112	109
113		- public void setDispParam(String dispParam) {
114		- this.dispParam = dispParam;
115		- }
	110	+ public void setDispParam(String dispParam) {
	111	+ this.dispParam = dispParam;
	112	+ }
116	113
117		- @Column(name = "exec_host", length = 64)
118		- public String getExecHost() {
119		- return this.execHost;
120		- }
	114	+ @Column(name = "exec_host", length = 64)
	115	+ public String getExecHost() {
	116	+ return this.execHost;
	117	+ }
121	118
122		- public void setExecHost(String execHost) {
123		- this.execHost = execHost;
124		- }
	119	+ public void setExecHost(String execHost) {
	120	+ this.execHost = execHost;
	121	+ }
125	122
126		- @Column(name = "status", nullable = false)
127		- public int getStatus() {
128		- return this.status;
129		- }
	123	+ @Column(name = "status", nullable = false)
	124	+ public int getStatus() {
	125	+ return this.status;
	126	+ }
130	127
131		- public void setStatus(int status) {
132		- this.status = status;
133		- }
	128	+ public void setStatus(int status) {
	129	+ this.status = status;
	130	+ }
134	131
135		- @Column(name = "message", length = 512)
136		- public String getMessage() {
137		- return this.message;
138		- }
	132	+ @Column(name = "message", length = 512)
	133	+ public String getMessage() {
	134	+ return this.message;
	135	+ }
139	136
140		- public void setMessage(String message) {
141		- this.message = message;
142		- }
	137	+ public void setMessage(String message) {
	138	+ this.message = message;
	139	+ }
143	140
144		- @Column(name = "remark", length = 256)
145		- public String getRemark() {
146		- return this.remark;
147		- }
	141	+ @Column(name = "remark", length = 256)
	142	+ public String getRemark() {
	143	+ return this.remark;
	144	+ }
148	145
149		- public void setRemark(String remark) {
150		- this.remark = remark;
151		- }
152		-
	146	+ public void setRemark(String remark) {
	147	+ this.remark = remark;
	148	+ }
153	149	}

--- trunk/framework/pjDb/src/main/java/project/db/model/FwJobDetail.java (revision 2442)

+++ trunk/framework/pjDb/src/main/java/project/db/model/FwJobDetail.java (revision 2443)

		@@ -1,98 +1,93 @@
1	1	package project.db.model;
2	2
3		-import java.util.Date;
	3	+import jakarta.persistence.AttributeOverride;
	4	+import jakarta.persistence.AttributeOverrides;
	5	+import jakarta.persistence.Column;
	6	+import jakarta.persistence.EmbeddedId;
	7	+import jakarta.persistence.Entity;
	8	+import jakarta.persistence.Table;
	9	+import java.sql.Timestamp;
4	10
5		-import jakarta.persistence.AttributeOverride;
6		-import jakarta.persistence.AttributeOverrides;
7		-import jakarta.persistence.Column;
8		-import jakarta.persistence.EmbeddedId;
9		-import jakarta.persistence.Entity;
10		-import jakarta.persistence.Table;
11		-import jakarta.persistence.Temporal;
12		-import jakarta.persistence.TemporalType;
13		-
14	11	/**
15	12	* FwJobDetail generated by hbm2java
16	13	*/
17	14	@org.hibernate.annotations.DynamicInsert
18	15	@Entity
19		-@Table(name = "fw_job_detail")
	16	+@Table(name = "fw_job_detail"
	17	+)
20	18	public class FwJobDetail implements java.io.Serializable {
21	19
22		- private FwJobDetailId id;
23		- private String batName;
24		- private int pid;
25		- private int status;
26		- private Date startDateTime;
27		- private Date stopDateTime;
28		- private String message;
	20	+ private FwJobDetailId id;
	21	+ private String batName;
	22	+ private int pid;
	23	+ private int status;
	24	+ private Timestamp startDateTime;
	25	+ private Timestamp stopDateTime;
	26	+ private String message;
29	27
30		- @EmbeddedId
31		- @AttributeOverrides({
32		- @AttributeOverride(name = "jobSeq", column = @Column(name = "job_seq", nullable = false)),
33		- @AttributeOverride(name = "batSeq", column = @Column(name = "bat_seq", nullable = false)) })
34		- public FwJobDetailId getId() {
35		- return this.id;
36		- }
	28	+ @EmbeddedId
	29	+ @AttributeOverrides( {
	30	+ @AttributeOverride(name = "batSeq", column = @Column(name = "bat_seq", nullable = false) ),
	31	+ @AttributeOverride(name = "jobSeq", column = @Column(name = "job_seq", nullable = false) ) } )
	32	+ public FwJobDetailId getId() {
	33	+ return this.id;
	34	+ }
37	35
38		- public void setId(FwJobDetailId id) {
39		- this.id = id;
40		- }
	36	+ public void setId(FwJobDetailId id) {
	37	+ this.id = id;
	38	+ }
41	39
42		- @Column(name = "bat_name", nullable = false, length = 128)
43		- public String getBatName() {
44		- return this.batName;
45		- }
	40	+ @Column(name = "bat_name", nullable = false, length = 128)
	41	+ public String getBatName() {
	42	+ return this.batName;
	43	+ }
46	44
47		- public void setBatName(String batName) {
48		- this.batName = batName;
49		- }
	45	+ public void setBatName(String batName) {
	46	+ this.batName = batName;
	47	+ }
50	48
51		- @Column(name = "pid", nullable = false)
52		- public int getPid() {
53		- return this.pid;
54		- }
	49	+ @Column(name = "pid", nullable = false)
	50	+ public int getPid() {
	51	+ return this.pid;
	52	+ }
55	53
56		- public void setPid(int pid) {
57		- this.pid = pid;
58		- }
	54	+ public void setPid(int pid) {
	55	+ this.pid = pid;
	56	+ }
59	57
60		- @Column(name = "status", nullable = false)
61		- public int getStatus() {
62		- return this.status;
63		- }
	58	+ @Column(name = "status", nullable = false)
	59	+ public int getStatus() {
	60	+ return this.status;
	61	+ }
64	62
65		- public void setStatus(int status) {
66		- this.status = status;
67		- }
	63	+ public void setStatus(int status) {
	64	+ this.status = status;
	65	+ }
68	66
69		- @Temporal(TemporalType.TIMESTAMP)
70		- @Column(name = "start_date_time", nullable = false, length = 29)
71		- public Date getStartDateTime() {
72		- return this.startDateTime;
73		- }
	67	+ @Column(name = "start_date_time", nullable = false, length = 29)
	68	+ public Timestamp getStartDateTime() {
	69	+ return this.startDateTime;
	70	+ }
74	71
75		- public void setStartDateTime(Date startDateTime) {
76		- this.startDateTime = startDateTime;
77		- }
	72	+ public void setStartDateTime(Timestamp startDateTime) {
	73	+ this.startDateTime = startDateTime;
	74	+ }
78	75
79		- @Temporal(TemporalType.TIMESTAMP)
80		- @Column(name = "stop_date_time", length = 29)
81		- public Date getStopDateTime() {
82		- return this.stopDateTime;
83		- }
	76	+ @Column(name = "stop_date_time", length = 29)
	77	+ public Timestamp getStopDateTime() {
	78	+ return this.stopDateTime;
	79	+ }
84	80
85		- public void setStopDateTime(Date stopDateTime) {
86		- this.stopDateTime = stopDateTime;
87		- }
	81	+ public void setStopDateTime(Timestamp stopDateTime) {
	82	+ this.stopDateTime = stopDateTime;
	83	+ }
88	84
89		- @Column(name = "message", length = 512)
90		- public String getMessage() {
91		- return this.message;
92		- }
	85	+ @Column(name = "message", length = 512)
	86	+ public String getMessage() {
	87	+ return this.message;
	88	+ }
93	89
94		- public void setMessage(String message) {
95		- this.message = message;
96		- }
97		-
	90	+ public void setMessage(String message) {
	91	+ this.message = message;
	92	+ }
98	93	}

--- trunk/framework/pjDb/src/main/java/project/db/model/FwJobDetailId.java (revision 2442)

+++ trunk/framework/pjDb/src/main/java/project/db/model/FwJobDetailId.java (revision 2443)

		@@ -1,7 +1,7 @@
1	1	package project.db.model;
2	2
3		-import jakarta.persistence.Column;
4		-import jakarta.persistence.Embeddable;
	3	+import jakarta.persistence.Column;
	4	+import jakarta.persistence.Embeddable;
5	5
6	6	/**
7	7	* FwJobDetailId generated by hbm2java

		@@ -9,46 +9,38 @@
9	9	@Embeddable
10	10	public class FwJobDetailId implements java.io.Serializable {
11	11
12		- private long jobSeq;
13		- private int batSeq;
	12	+ private int batSeq;
	13	+ private long jobSeq;
14	14
15		- @Column(name = "job_seq", nullable = false)
16		- public long getJobSeq() {
17		- return this.jobSeq;
18		- }
	15	+ @Column(name = "bat_seq", nullable = false)
	16	+ public int getBatSeq() {
	17	+ return this.batSeq;
	18	+ }
19	19
20		- public void setJobSeq(long jobSeq) {
21		- this.jobSeq = jobSeq;
22		- }
	20	+ public void setBatSeq(int batSeq) {
	21	+ this.batSeq = batSeq;
	22	+ }
23	23
24		- @Column(name = "bat_seq", nullable = false)
25		- public int getBatSeq() {
26		- return this.batSeq;
27		- }
	24	+ @Column(name = "job_seq", nullable = false)
	25	+ public long getJobSeq() {
	26	+ return this.jobSeq;
	27	+ }
28	28
29		- public void setBatSeq(int batSeq) {
30		- this.batSeq = batSeq;
31		- }
	29	+ public void setJobSeq(long jobSeq) {
	30	+ this.jobSeq = jobSeq;
	31	+ }
32	32
33		- public boolean equals(Object other) {
34		- if ((this == other))
35		- return true;
36		- if ((other == null))
37		- return false;
38		- if (!(other instanceof FwJobDetailId))
39		- return false;
40		- FwJobDetailId castOther = (FwJobDetailId) other;
	33	+ public boolean equals(Object other) {
	34	+ return (this == other)
	35	+ \|\| (other instanceof FwJobDetailId castOther)
	36	+ && (this.getBatSeq() == castOther.getBatSeq())
	37	+ && (this.getJobSeq() == castOther.getJobSeq());
	38	+ }
41	39
42		- return (this.getJobSeq() == castOther.getJobSeq())
43		- && (this.getBatSeq() == castOther.getBatSeq());
44		- }
45		-
46		- public int hashCode() {
47		- int result = 17;
48		-
49		- result = 37 * result + (int) this.getJobSeq();
50		- result = 37 * result + this.getBatSeq();
51		- return result;
52		- }
53		-
	40	+ public int hashCode() {
	41	+ int result = 17;
	42	+ result = 37 * result + this.getBatSeq();
	43	+ result = 37 * result + (int) this.getJobSeq();
	44	+ return result;
	45	+ }
54	46	}

--- trunk/framework/pjDb/src/main/java/project/db/model/FwJobFile.java (revision 2442)

+++ trunk/framework/pjDb/src/main/java/project/db/model/FwJobFile.java (revision 2443)

		@@ -1,11 +1,11 @@
1	1	package project.db.model;
2	2
3		-import jakarta.persistence.AttributeOverride;
4		-import jakarta.persistence.AttributeOverrides;
5		-import jakarta.persistence.Column;
6		-import jakarta.persistence.EmbeddedId;
7		-import jakarta.persistence.Entity;
8		-import jakarta.persistence.Table;
	3	+import jakarta.persistence.AttributeOverride;
	4	+import jakarta.persistence.AttributeOverrides;
	5	+import jakarta.persistence.Column;
	6	+import jakarta.persistence.EmbeddedId;
	7	+import jakarta.persistence.Entity;
	8	+import jakarta.persistence.Table;
9	9
10	10	/**
11	11	* FwJobFile generated by hbm2java

		@@ -12,72 +12,72 @@
12	12	*/
13	13	@org.hibernate.annotations.DynamicInsert
14	14	@Entity
15		-@Table(name = "fw_job_file")
	15	+@Table(name = "fw_job_file"
	16	+)
16	17	public class FwJobFile implements java.io.Serializable {
17	18
18		- private FwJobFileId id;
19		- private String fileName;
20		- private String filePath;
21		- private Long fileSize;
22		- private String downloadName;
23		- private int downloadCount;
	19	+ private FwJobFileId id;
	20	+ private String fileName;
	21	+ private String filePath;
	22	+ private Long fileSize;
	23	+ private String downloadName;
	24	+ private int downloadCount;
24	25
25		- @EmbeddedId
26		- @AttributeOverrides({
27		- @AttributeOverride(name = "jobSeq", column = @Column(name = "job_seq", nullable = false)),
28		- @AttributeOverride(name = "batSeq", column = @Column(name = "bat_seq", nullable = false)),
29		- @AttributeOverride(name = "fileSeq", column = @Column(name = "file_seq", nullable = false)) })
30		- public FwJobFileId getId() {
31		- return this.id;
32		- }
	26	+ @EmbeddedId
	27	+ @AttributeOverrides( {
	28	+ @AttributeOverride(name = "batSeq", column = @Column(name = "bat_seq", nullable = false) ),
	29	+ @AttributeOverride(name = "fileSeq", column = @Column(name = "file_seq", nullable = false) ),
	30	+ @AttributeOverride(name = "jobSeq", column = @Column(name = "job_seq", nullable = false) ) } )
	31	+ public FwJobFileId getId() {
	32	+ return this.id;
	33	+ }
33	34
34		- public void setId(FwJobFileId id) {
35		- this.id = id;
36		- }
	35	+ public void setId(FwJobFileId id) {
	36	+ this.id = id;
	37	+ }
37	38
38		- @Column(name = "file_name", nullable = false, length = 128)
39		- public String getFileName() {
40		- return this.fileName;
41		- }
	39	+ @Column(name = "file_name", nullable = false, length = 128)
	40	+ public String getFileName() {
	41	+ return this.fileName;
	42	+ }
42	43
43		- public void setFileName(String fileName) {
44		- this.fileName = fileName;
45		- }
	44	+ public void setFileName(String fileName) {
	45	+ this.fileName = fileName;
	46	+ }
46	47
47		- @Column(name = "file_path", length = 256)
48		- public String getFilePath() {
49		- return this.filePath;
50		- }
	48	+ @Column(name = "file_path", length = 256)
	49	+ public String getFilePath() {
	50	+ return this.filePath;
	51	+ }
51	52
52		- public void setFilePath(String filePath) {
53		- this.filePath = filePath;
54		- }
	53	+ public void setFilePath(String filePath) {
	54	+ this.filePath = filePath;
	55	+ }
55	56
56		- @Column(name = "file_size")
57		- public Long getFileSize() {
58		- return this.fileSize;
59		- }
	57	+ @Column(name = "file_size")
	58	+ public Long getFileSize() {
	59	+ return this.fileSize;
	60	+ }
60	61
61		- public void setFileSize(Long fileSize) {
62		- this.fileSize = fileSize;
63		- }
	62	+ public void setFileSize(Long fileSize) {
	63	+ this.fileSize = fileSize;
	64	+ }
64	65
65		- @Column(name = "download_name", length = 128)
66		- public String getDownloadName() {
67		- return this.downloadName;
68		- }
	66	+ @Column(name = "download_name", length = 128)
	67	+ public String getDownloadName() {
	68	+ return this.downloadName;
	69	+ }
69	70
70		- public void setDownloadName(String downloadName) {
71		- this.downloadName = downloadName;
72		- }
	71	+ public void setDownloadName(String downloadName) {
	72	+ this.downloadName = downloadName;
	73	+ }
73	74
74		- @Column(name = "download_count", nullable = false)
75		- public int getDownloadCount() {
76		- return this.downloadCount;
77		- }
	75	+ @Column(name = "download_count", nullable = false)
	76	+ public int getDownloadCount() {
	77	+ return this.downloadCount;
	78	+ }
78	79
79		- public void setDownloadCount(int downloadCount) {
80		- this.downloadCount = downloadCount;
81		- }
82		-
	80	+ public void setDownloadCount(int downloadCount) {
	81	+ this.downloadCount = downloadCount;
	82	+ }
83	83	}

--- trunk/framework/pjDb/src/main/java/project/db/model/FwJobFileId.java (revision 2442)

+++ trunk/framework/pjDb/src/main/java/project/db/model/FwJobFileId.java (revision 2443)

		@@ -1,7 +1,7 @@
1	1	package project.db.model;
2	2
3		-import jakarta.persistence.Column;
4		-import jakarta.persistence.Embeddable;
	3	+import jakarta.persistence.Column;
	4	+import jakarta.persistence.Embeddable;
5	5
6	6	/**
7	7	* FwJobFileId generated by hbm2java

		@@ -9,58 +9,50 @@
9	9	@Embeddable
10	10	public class FwJobFileId implements java.io.Serializable {
11	11
12		- private long jobSeq;
13		- private int batSeq;
14		- private int fileSeq;
	12	+ private int batSeq;
	13	+ private int fileSeq;
	14	+ private long jobSeq;
15	15
16		- @Column(name = "job_seq", nullable = false)
17		- public long getJobSeq() {
18		- return this.jobSeq;
19		- }
	16	+ @Column(name = "bat_seq", nullable = false)
	17	+ public int getBatSeq() {
	18	+ return this.batSeq;
	19	+ }
20	20
21		- public void setJobSeq(long jobSeq) {
22		- this.jobSeq = jobSeq;
23		- }
	21	+ public void setBatSeq(int batSeq) {
	22	+ this.batSeq = batSeq;
	23	+ }
24	24
25		- @Column(name = "bat_seq", nullable = false)
26		- public int getBatSeq() {
27		- return this.batSeq;
28		- }
	25	+ @Column(name = "file_seq", nullable = false)
	26	+ public int getFileSeq() {
	27	+ return this.fileSeq;
	28	+ }
29	29
30		- public void setBatSeq(int batSeq) {
31		- this.batSeq = batSeq;
32		- }
	30	+ public void setFileSeq(int fileSeq) {
	31	+ this.fileSeq = fileSeq;
	32	+ }
33	33
34		- @Column(name = "file_seq", nullable = false)
35		- public int getFileSeq() {
36		- return this.fileSeq;
37		- }
	34	+ @Column(name = "job_seq", nullable = false)
	35	+ public long getJobSeq() {
	36	+ return this.jobSeq;
	37	+ }
38	38
39		- public void setFileSeq(int fileSeq) {
40		- this.fileSeq = fileSeq;
41		- }
	39	+ public void setJobSeq(long jobSeq) {
	40	+ this.jobSeq = jobSeq;
	41	+ }
42	42
43		- public boolean equals(Object other) {
44		- if ((this == other))
45		- return true;
46		- if ((other == null))
47		- return false;
48		- if (!(other instanceof FwJobFileId))
49		- return false;
50		- FwJobFileId castOther = (FwJobFileId) other;
	43	+ public boolean equals(Object other) {
	44	+ return (this == other)
	45	+ \|\| (other instanceof FwJobFileId castOther)
	46	+ && (this.getBatSeq() == castOther.getBatSeq())
	47	+ && (this.getFileSeq() == castOther.getFileSeq())
	48	+ && (this.getJobSeq() == castOther.getJobSeq());
	49	+ }
51	50
52		- return (this.getJobSeq() == castOther.getJobSeq())
53		- && (this.getBatSeq() == castOther.getBatSeq())
54		- && (this.getFileSeq() == castOther.getFileSeq());
55		- }
56		-
57		- public int hashCode() {
58		- int result = 17;
59		-
60		- result = 37 * result + (int) this.getJobSeq();
61		- result = 37 * result + this.getBatSeq();
62		- result = 37 * result + this.getFileSeq();
63		- return result;
64		- }
65		-
	51	+ public int hashCode() {
	52	+ int result = 17;
	53	+ result = 37 * result + this.getBatSeq();
	54	+ result = 37 * result + this.getFileSeq();
	55	+ result = 37 * result + (int) this.getJobSeq();
	56	+ return result;
	57	+ }
66	58	}

--- trunk/framework/pjDb/src/main/java/project/db/model/FwJobRepeat.java (revision 2442)

+++ trunk/framework/pjDb/src/main/java/project/db/model/FwJobRepeat.java (revision 2443)

		@@ -1,178 +1,174 @@
1	1	package project.db.model;
2	2
3		-import java.util.Date;
	3	+import jakarta.persistence.Column;
	4	+import jakarta.persistence.Entity;
	5	+import jakarta.persistence.GeneratedValue;
	6	+import static jakarta.persistence.GenerationType.SEQUENCE;
	7	+import jakarta.persistence.Id;
	8	+import jakarta.persistence.SequenceGenerator;
	9	+import jakarta.persistence.Table;
	10	+import java.sql.Timestamp;
4	11
5		-import jakarta.persistence.Column;
6		-import jakarta.persistence.Entity;
7		-import jakarta.persistence.GeneratedValue;
8		-import jakarta.persistence.Id;
9		-import jakarta.persistence.SequenceGenerator;
10		-import jakarta.persistence.Table;
11		-import jakarta.persistence.Temporal;
12		-import jakarta.persistence.TemporalType;
13		-
14	12	/**
15	13	* FwJobRepeat generated by hbm2java
16	14	*/
17	15	@org.hibernate.annotations.DynamicInsert
18	16	@Entity
19		-@Table(name = "fw_job_repeat")
	17	+@Table(name = "fw_job_repeat"
	18	+)
20	19	public class FwJobRepeat implements java.io.Serializable {
21	20
22		- private Long id;
23		- private String jobId;
24		- private String jobName;
25		- private String batParam;
26		- private String dispParam;
27		- private String interval;
28		- private String hour;
29		- private String minute;
30		- private String week;
31		- private String yearMonthDay;
32		- private Date insertDatetime;
33		- private String insertId;
34		- private Date updateDatetime;
35		- private String updateId;
36		- private int version;
	21	+ private Long id;
	22	+ private String jobId;
	23	+ private String jobName;
	24	+ private String batParam;
	25	+ private String dispParam;
	26	+ private String interval;
	27	+ private String hour;
	28	+ private String minute;
	29	+ private String week;
	30	+ private String yearMonthDay;
	31	+ private Timestamp insertDatetime;
	32	+ private String insertId;
	33	+ private Timestamp updateDatetime;
	34	+ private String updateId;
	35	+ private int version;
37	36
38		- @Id
39		- @SequenceGenerator(name = "generator", sequenceName = "generator", allocationSize = 1)
40		- @GeneratedValue(generator = "generator")
41		- @Column(name = "id", unique = true, nullable = false)
42		- public Long getId() {
43		- return this.id;
44		- }
	37	+ @SequenceGenerator(name = "project.db.model.FwJobRepeatIdGenerator", sequenceName = "generator", allocationSize = 1)
	38	+ @Id
	39	+ @GeneratedValue(strategy = SEQUENCE, generator = "project.db.model.FwJobRepeatIdGenerator")
	40	+ @Column(name = "id", unique = true, nullable = false)
	41	+ public Long getId() {
	42	+ return this.id;
	43	+ }
45	44
46		- public void setId(Long id) {
47		- this.id = id;
48		- }
	45	+ public void setId(Long id) {
	46	+ this.id = id;
	47	+ }
49	48
50		- @Column(name = "job_id", nullable = false, length = 32)
51		- public String getJobId() {
52		- return this.jobId;
53		- }
	49	+ @Column(name = "job_id", nullable = false, length = 32)
	50	+ public String getJobId() {
	51	+ return this.jobId;
	52	+ }
54	53
55		- public void setJobId(String jobId) {
56		- this.jobId = jobId;
57		- }
	54	+ public void setJobId(String jobId) {
	55	+ this.jobId = jobId;
	56	+ }
58	57
59		- @Column(name = "job_name", nullable = false, length = 128)
60		- public String getJobName() {
61		- return this.jobName;
62		- }
	58	+ @Column(name = "job_name", nullable = false, length = 128)
	59	+ public String getJobName() {
	60	+ return this.jobName;
	61	+ }
63	62
64		- public void setJobName(String jobName) {
65		- this.jobName = jobName;
66		- }
	63	+ public void setJobName(String jobName) {
	64	+ this.jobName = jobName;
	65	+ }
67	66
68		- @Column(name = "bat_param", length = 512)
69		- public String getBatParam() {
70		- return this.batParam;
71		- }
	67	+ @Column(name = "bat_param", length = 512)
	68	+ public String getBatParam() {
	69	+ return this.batParam;
	70	+ }
72	71
73		- public void setBatParam(String batParam) {
74		- this.batParam = batParam;
75		- }
	72	+ public void setBatParam(String batParam) {
	73	+ this.batParam = batParam;
	74	+ }
76	75
77		- @Column(name = "disp_param", length = 512)
78		- public String getDispParam() {
79		- return this.dispParam;
80		- }
	76	+ @Column(name = "disp_param", length = 512)
	77	+ public String getDispParam() {
	78	+ return this.dispParam;
	79	+ }
81	80
82		- public void setDispParam(String dispParam) {
83		- this.dispParam = dispParam;
84		- }
	81	+ public void setDispParam(String dispParam) {
	82	+ this.dispParam = dispParam;
	83	+ }
85	84
86		- @Column(name = "interval", length = 8)
87		- public String getInterval() {
88		- return this.interval;
89		- }
	85	+ @Column(name = "interval", length = 8)
	86	+ public String getInterval() {
	87	+ return this.interval;
	88	+ }
90	89
91		- public void setInterval(String interval) {
92		- this.interval = interval;
93		- }
	90	+ public void setInterval(String interval) {
	91	+ this.interval = interval;
	92	+ }
94	93
95		- @Column(name = "hour", length = 2)
96		- public String getHour() {
97		- return this.hour;
98		- }
	94	+ @Column(name = "hour", length = 2)
	95	+ public String getHour() {
	96	+ return this.hour;
	97	+ }
99	98
100		- public void setHour(String hour) {
101		- this.hour = hour;
102		- }
	99	+ public void setHour(String hour) {
	100	+ this.hour = hour;
	101	+ }
103	102
104		- @Column(name = "minute", length = 2)
105		- public String getMinute() {
106		- return this.minute;
107		- }
	103	+ @Column(name = "minute", length = 2)
	104	+ public String getMinute() {
	105	+ return this.minute;
	106	+ }
108	107
109		- public void setMinute(String minute) {
110		- this.minute = minute;
111		- }
	108	+ public void setMinute(String minute) {
	109	+ this.minute = minute;
	110	+ }
112	111
113		- @Column(name = "week", length = 1)
114		- public String getWeek() {
115		- return this.week;
116		- }
	112	+ @Column(name = "week", length = 1)
	113	+ public String getWeek() {
	114	+ return this.week;
	115	+ }
117	116
118		- public void setWeek(String week) {
119		- this.week = week;
120		- }
	117	+ public void setWeek(String week) {
	118	+ this.week = week;
	119	+ }
121	120
122		- @Column(name = "year_month_day", length = 8)
123		- public String getYearMonthDay() {
124		- return this.yearMonthDay;
125		- }
	121	+ @Column(name = "year_month_day", length = 8)
	122	+ public String getYearMonthDay() {
	123	+ return this.yearMonthDay;
	124	+ }
126	125
127		- public void setYearMonthDay(String yearMonthDay) {
128		- this.yearMonthDay = yearMonthDay;
129		- }
	126	+ public void setYearMonthDay(String yearMonthDay) {
	127	+ this.yearMonthDay = yearMonthDay;
	128	+ }
130	129
131		- @Temporal(TemporalType.TIMESTAMP)
132		- @Column(name = "insert_datetime", nullable = false, length = 29)
133		- public Date getInsertDatetime() {
134		- return this.insertDatetime;
135		- }
	130	+ @Column(name = "insert_datetime", nullable = false, length = 29)
	131	+ public Timestamp getInsertDatetime() {
	132	+ return this.insertDatetime;
	133	+ }
136	134
137		- public void setInsertDatetime(Date insertDatetime) {
138		- this.insertDatetime = insertDatetime;
139		- }
	135	+ public void setInsertDatetime(Timestamp insertDatetime) {
	136	+ this.insertDatetime = insertDatetime;
	137	+ }
140	138
141		- @Column(name = "insert_id", nullable = false, length = 32)
142		- public String getInsertId() {
143		- return this.insertId;
144		- }
	139	+ @Column(name = "insert_id", nullable = false, length = 32)
	140	+ public String getInsertId() {
	141	+ return this.insertId;
	142	+ }
145	143
146		- public void setInsertId(String insertId) {
147		- this.insertId = insertId;
148		- }
	144	+ public void setInsertId(String insertId) {
	145	+ this.insertId = insertId;
	146	+ }
149	147
150		- @Temporal(TemporalType.TIMESTAMP)
151		- @Column(name = "update_datetime", nullable = false, length = 29)
152		- public Date getUpdateDatetime() {
153		- return this.updateDatetime;
154		- }
	148	+ @Column(name = "update_datetime", nullable = false, length = 29)
	149	+ public Timestamp getUpdateDatetime() {
	150	+ return this.updateDatetime;
	151	+ }
155	152
156		- public void setUpdateDatetime(Date updateDatetime) {
157		- this.updateDatetime = updateDatetime;
158		- }
	153	+ public void setUpdateDatetime(Timestamp updateDatetime) {
	154	+ this.updateDatetime = updateDatetime;
	155	+ }
159	156
160		- @Column(name = "update_id", nullable = false, length = 32)
161		- public String getUpdateId() {
162		- return this.updateId;
163		- }
	157	+ @Column(name = "update_id", nullable = false, length = 32)
	158	+ public String getUpdateId() {
	159	+ return this.updateId;
	160	+ }
164	161
165		- public void setUpdateId(String updateId) {
166		- this.updateId = updateId;
167		- }
	162	+ public void setUpdateId(String updateId) {
	163	+ this.updateId = updateId;
	164	+ }
168	165
169		- @Column(name = "version", nullable = false)
170		- public int getVersion() {
171		- return this.version;
172		- }
	166	+ @Column(name = "version", nullable = false)
	167	+ public int getVersion() {
	168	+ return this.version;
	169	+ }
173	170
174		- public void setVersion(int version) {
175		- this.version = version;
176		- }
177		-
	171	+ public void setVersion(int version) {
	172	+ this.version = version;
	173	+ }
178	174	}