diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5d45577..99a81de 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,19 +7,15 @@ - - - - - - - - - - - - + + + + + + + + @@ -62,7 +58,7 @@ - + @@ -74,7 +70,7 @@ - + @@ -86,7 +82,7 @@ - + @@ -95,7 +91,7 @@ - + @@ -111,111 +107,49 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -317,15 +251,15 @@ @@ -466,16 +400,6 @@ - - - - - - - - - - @@ -511,7 +435,7 @@ - + @@ -966,7 +890,7 @@ - + 1521703079910 @@ -1315,7 +1239,7 @@ - @@ -1330,8 +1254,8 @@ - - + + @@ -1366,7 +1290,7 @@ - + @@ -1760,13 +1684,6 @@ - - - - - - - @@ -1788,23 +1705,6 @@ - - - - - - - - - - - - - - - - - @@ -1833,42 +1733,33 @@ - + - - + + - + + + - - - - - - - - - - - - + + - - + + - - - - + + + @@ -1877,164 +1768,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java index 483a7a8..ec8b6c7 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -5,10 +5,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_PLAN") +@Table(name = "PG_ASSET_INSPECTIONPLAN") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONPLAN_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONPLAN_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionPlan implements Serializable { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planName;//巡检计划名称 private Date startDate;//巡检开始时间 private String frequency;//巡检频率 @@ -39,6 +40,7 @@ private String inSpectionGroup;//巡检部门 private Date endDate;//null + /* * @GeneratedValue注解的strategy提供了四种值 * AUTO主键由程序控制，是默认选项 @@ -47,12 +49,13 @@ * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 * */ @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONPLAN_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5d45577..99a81de 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,19 +7,15 @@ - - - - - - - - - - - - + + + + + + + + @@ -62,7 +58,7 @@ - + @@ -74,7 +70,7 @@ - + @@ -86,7 +82,7 @@ - + @@ -95,7 +91,7 @@ - + @@ -111,111 +107,49 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -317,15 +251,15 @@ @@ -466,16 +400,6 @@ - - - - - - - - - - @@ -511,7 +435,7 @@ - + @@ -966,7 +890,7 @@ - + 1521703079910 @@ -1315,7 +1239,7 @@ - @@ -1330,8 +1254,8 @@ - - + + @@ -1366,7 +1290,7 @@ - + @@ -1760,13 +1684,6 @@ - - - - - - - @@ -1788,23 +1705,6 @@ - - - - - - - - - - - - - - - - - @@ -1833,42 +1733,33 @@ - + - - + + - + + + - - - - - - - - - - - - + + - - + + - - - - + + + @@ -1877,164 +1768,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java index 483a7a8..ec8b6c7 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -5,10 +5,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_PLAN") +@Table(name = "PG_ASSET_INSPECTIONPLAN") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONPLAN_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONPLAN_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionPlan implements Serializable { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planName;//巡检计划名称 private Date startDate;//巡检开始时间 private String frequency;//巡检频率 @@ -39,6 +40,7 @@ private String inSpectionGroup;//巡检部门 private Date endDate;//null + /* * @GeneratedValue注解的strategy提供了四种值 * AUTO主键由程序控制，是默认选项 @@ -47,12 +49,13 @@ * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 * */ @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONPLAN_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java index 023e5c4..65b0fb6 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java @@ -6,10 +6,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_PLAN_CONFIG") +@Table(name = "PG_ASSET_INSPECTIONPLANCONFIG") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONPLANCONFIG_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONPLANCONFIG_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionPlanConfig implements Serializable { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planId;//巡检计划keyID private String configId;//巡检配置keyId private String configText;//配置文件内容 @@ -21,12 +22,13 @@ private String configClassifiation;//巡检类别 @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONPLANCONFIG_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java index b1043b0..b98decb 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java @@ -5,10 +5,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_RECORD") +@Table(name = "PG_ASSET_INSPECTIONRECORD") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONRECORD_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONRECORD_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionRecord implements Serializable { - private String keyId;//null; + private Long keyId;//null; private String planId;//巡检计划keyId private Date createDate;//创建日期 private int state;//巡检记录状态 @@ -26,12 +27,13 @@ private String planName;//计划名称 @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONRECORD_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5d45577..99a81de 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,19 +7,15 @@ - - - - - - - - - - - - + + + + + + + + @@ -62,7 +58,7 @@ - + @@ -74,7 +70,7 @@ - + @@ -86,7 +82,7 @@ - + @@ -95,7 +91,7 @@ - + @@ -111,111 +107,49 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -317,15 +251,15 @@ @@ -466,16 +400,6 @@ - - - - - - - - - - @@ -511,7 +435,7 @@ - + @@ -966,7 +890,7 @@ - + 1521703079910 @@ -1315,7 +1239,7 @@ - @@ -1330,8 +1254,8 @@ - - + + @@ -1366,7 +1290,7 @@ - + @@ -1760,13 +1684,6 @@ - - - - - - - @@ -1788,23 +1705,6 @@ - - - - - - - - - - - - - - - - - @@ -1833,42 +1733,33 @@ - + - - + + - + + + - - - - - - - - - - - - + + - - + + - - - - + + + @@ -1877,164 +1768,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java index 483a7a8..ec8b6c7 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -5,10 +5,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_PLAN") +@Table(name = "PG_ASSET_INSPECTIONPLAN") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONPLAN_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONPLAN_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionPlan implements Serializable { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planName;//巡检计划名称 private Date startDate;//巡检开始时间 private String frequency;//巡检频率 @@ -39,6 +40,7 @@ private String inSpectionGroup;//巡检部门 private Date endDate;//null + /* * @GeneratedValue注解的strategy提供了四种值 * AUTO主键由程序控制，是默认选项 @@ -47,12 +49,13 @@ * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 * */ @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONPLAN_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java index 023e5c4..65b0fb6 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java @@ -6,10 +6,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_PLAN_CONFIG") +@Table(name = "PG_ASSET_INSPECTIONPLANCONFIG") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONPLANCONFIG_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONPLANCONFIG_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionPlanConfig implements Serializable { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planId;//巡检计划keyID private String configId;//巡检配置keyId private String configText;//配置文件内容 @@ -21,12 +22,13 @@ private String configClassifiation;//巡检类别 @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONPLANCONFIG_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java index b1043b0..b98decb 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java @@ -5,10 +5,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_RECORD") +@Table(name = "PG_ASSET_INSPECTIONRECORD") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONRECORD_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONRECORD_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionRecord implements Serializable { - private String keyId;//null; + private Long keyId;//null; private String planId;//巡检计划keyId private Date createDate;//创建日期 private int state;//巡检记录状态 @@ -26,12 +27,13 @@ private String planName;//计划名称 @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONRECORD_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java index 51e1f9a..cc8ed09 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java @@ -5,10 +5,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_RECORD_DETAIL") +@Table(name = "PG_ASSET_INSPECTIONRECORDDET") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONRECORDDET_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONRECORDDET_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionRecordDetail implements Serializable { - private String keyId;//null + private Long keyId;//null private String stockKeyId;//设备编号 private String inspector;//巡检人 private Date inspectTime;//巡检时间 @@ -28,12 +29,13 @@ @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONRECORDDET_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java index 18a1184..4949848 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java @@ -2,7 +2,7 @@ public class PgAssetInSpectionPlanConfigDto { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planId;//巡检计划keyID private String configId;//巡检配置keyId private String configText;//配置文件内容 @@ -13,11 +13,11 @@ private String stockCategory;//巡检设备二级分类 private String configClassifiation;//巡检类别 - public String getKeyId() { + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5d45577..99a81de 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,19 +7,15 @@ - - - - - - - - - - - - + + + + + + + + @@ -62,7 +58,7 @@ - + @@ -74,7 +70,7 @@ - + @@ -86,7 +82,7 @@ - + @@ -95,7 +91,7 @@ - + @@ -111,111 +107,49 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -317,15 +251,15 @@ @@ -466,16 +400,6 @@ - - - - - - - - - - @@ -511,7 +435,7 @@ - + @@ -966,7 +890,7 @@ - + 1521703079910 @@ -1315,7 +1239,7 @@ - @@ -1330,8 +1254,8 @@ - - + + @@ -1366,7 +1290,7 @@ - + @@ -1760,13 +1684,6 @@ - - - - - - - @@ -1788,23 +1705,6 @@ - - - - - - - - - - - - - - - - - @@ -1833,42 +1733,33 @@ - + - - + + - + + + - - - - - - - - - - - - + + - - + + - - - - + + + @@ -1877,164 +1768,65 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java index 483a7a8..ec8b6c7 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -5,10 +5,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_PLAN") +@Table(name = "PG_ASSET_INSPECTIONPLAN") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONPLAN_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONPLAN_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionPlan implements Serializable { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planName;//巡检计划名称 private Date startDate;//巡检开始时间 private String frequency;//巡检频率 @@ -39,6 +40,7 @@ private String inSpectionGroup;//巡检部门 private Date endDate;//null + /* * @GeneratedValue注解的strategy提供了四种值 * AUTO主键由程序控制，是默认选项 @@ -47,12 +49,13 @@ * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 * */ @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONPLAN_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java index 023e5c4..65b0fb6 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java @@ -6,10 +6,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_PLAN_CONFIG") +@Table(name = "PG_ASSET_INSPECTIONPLANCONFIG") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONPLANCONFIG_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONPLANCONFIG_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionPlanConfig implements Serializable { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planId;//巡检计划keyID private String configId;//巡检配置keyId private String configText;//配置文件内容 @@ -21,12 +22,13 @@ private String configClassifiation;//巡检类别 @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONPLANCONFIG_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java index b1043b0..b98decb 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java @@ -5,10 +5,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_RECORD") +@Table(name = "PG_ASSET_INSPECTIONRECORD") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONRECORD_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONRECORD_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionRecord implements Serializable { - private String keyId;//null; + private Long keyId;//null; private String planId;//巡检计划keyId private Date createDate;//创建日期 private int state;//巡检记录状态 @@ -26,12 +27,13 @@ private String planName;//计划名称 @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONRECORD_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java index 51e1f9a..cc8ed09 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java @@ -5,10 +5,11 @@ import java.util.Date; @Entity -@Table(name = "PG_ASSET_INSPECTION_RECORD_DETAIL") +@Table(name = "PG_ASSET_INSPECTIONRECORDDET") +@SequenceGenerator(name = "SEQ_PG_ASSET_INSPECTIONRECORDDET_ID", sequenceName = "SEQ_PG_ASSET_INSPECTIONRECORDDET_ID", allocationSize = 1, initialValue = 1) public class PgAssetInSpectionRecordDetail implements Serializable { - private String keyId;//null + private Long keyId;//null private String stockKeyId;//设备编号 private String inspector;//巡检人 private Date inspectTime;//巡检时间 @@ -28,12 +29,13 @@ @Id - @GeneratedValue(strategy= GenerationType.AUTO) - public String getKeyId() { + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_INSPECTIONRECORDDET_ID") + @Column(name="KEY_ID") + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java index 18a1184..4949848 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java @@ -2,7 +2,7 @@ public class PgAssetInSpectionPlanConfigDto { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planId;//巡检计划keyID private String configId;//巡检配置keyId private String configText;//配置文件内容 @@ -13,11 +13,11 @@ private String stockCategory;//巡检设备二级分类 private String configClassifiation;//巡检类别 - public String getKeyId() { + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java index cb4b6f9..7f0444a 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java @@ -2,7 +2,7 @@ public class PgAssetInSpectionPlanDto { - private String keyId;//唯一键值 + private Long keyId;//唯一键值 private String planName;//巡检计划名称 private String startDate;//巡检开始时间Date private String frequency;//巡检频率 @@ -33,11 +33,11 @@ private String inSpectionGroup;//巡检部门 private String endDate;//Date - public String getKeyId() { + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java index a1d961e..a14668e 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java @@ -2,7 +2,7 @@ public class PgAssetInSpectionRecordDetailDto { - private String keyId;//null + private Long keyId;//null private String stockKeyId;//设备编号 private String inspector;//巡检人 private String inspectTime;//巡检时间 @@ -20,11 +20,11 @@ private String creator;//null private String configNote;//记录单配置说明 - public String getKeyId() { + public Long getKeyId() { return keyId; } - public void setKeyId(String keyId) { + public void setKeyId(Long keyId) { this.keyId = keyId; } @@ -36,7 +36,6 @@ this.stockKeyId = stockKeyId; } - public String getInspector() { return inspector; } @@ -53,7 +52,6 @@ this.inspectTime = inspectTime; } - public String getInspectResult() { return inspectResult; } @@ -86,7 +84,6 @@ this.resolvent = resolvent; } - public String getFaultApplyId() { return faultApplyId; } @@ -103,7 +100,6 @@ this.configSort = configSort; } - public String getRecordId() { return recordId; } @@ -159,5 +155,6 @@ public void setConfigNote(String configNote) { this.configNote = configNote; } + } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 5d45577..99a81de 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,19 +7,15 @@ - - - - - - - - - - - - + + + + + + + + @@ -62,7 +58,7 @@ - + @@ -74,7 +70,7 @@ - + @@ -86,7 +82,7 @@ - + @@ -95,7 +91,7 @@ - + @@ -111,111 +107,49 @@ - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -317,15 +251,15 @@ @@ -466,16 +400,6 @@ - - - - - - - - - -