diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c71da56..5d45577 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,19 +6,20 @@ - + + + + + + + + + + + + + - - - - - - - - - - - @@ -61,7 +62,7 @@ - + @@ -73,8 +74,8 @@ - - + + @@ -83,10 +84,10 @@ - + - - + + @@ -94,7 +95,7 @@ - + @@ -111,10 +112,111 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,16 +275,6 @@ @@ -263,10 +365,9 @@ - @@ -332,7 +433,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -369,7 +511,7 @@ - + @@ -824,14 +966,7 @@ - - - - 1521168093758 - 1521703079910 @@ -1169,11 +1304,18 @@ - - @@ -1188,7 +1330,7 @@ - + @@ -1200,7 +1342,7 @@ - + @@ -1211,7 +1353,7 @@ - + @@ -1285,7 +1427,6 @@ - @@ -1310,7 +1451,8 @@ - @@ -1340,149 +1482,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1756,8 +1755,287 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java new file mode 100644 index 0000000..483a7a8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -0,0 +1,320 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN") +public class PgAssetInSpectionPlan implements Serializable { + + private String keyId;//唯一键值 + private String planName;//巡检计划名称 + private Date startDate;//巡检开始时间 + private String frequency;//巡检频率 + private int state;//状态 + private String responsibleDept;//负责单位/部门/小组 + private String planNo;//巡检计划编号 + private String inspectionType;//巡检类型 + private String inspectionMode;//巡检方式 + private String inspectionRoute;//巡检路线 + private String frequencyDate;//巡检具体日期 + private String frequencyTime;//巡检具体时间 + private String froJect;//项目 + private String comLile;//编制人 + private Date startTime;//编制时间 + private String developDept;//定制部门 + private Date endTime;//结束时间 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String inSpectionPerson;//巡检人 + private Date insertTime;//插入时间 + private Date createDate;//创建时间 + private String inSpectionEndTime;//巡检结束时间 + private String inSpectionPrace;//巡检地点 + private String creator;//创建人 + private String buildCabin;//巡检舱室 + private int mileage;//null + private String inSpectionStartTime;//巡检开始时间 + private String inSpectionGroup;//巡检部门 + private Date endDate;//null + + /* + * @GeneratedValue注解的strategy提供了四种值 + * AUTO主键由程序控制，是默认选项 + * IDENTITY主键由数据库生成，采用数据库自增长，ORACLE不支持这种方式 + * SEQUENCE通过数据库的序列产生主键，MYSQL不支持； + * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 + * */ + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + @Column(name="START_DATE") + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + @Column(name="FREQUENCY") + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="RESPONSIBLE_DEPT") + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + @Column(name="PLAN_NO") + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + @Column(name="INSPECTION_TYPE") + public String getInspectionType() { + return inspectionType; + } + + public void setInspectionType(String inspectionType) { + this.inspectionType = inspectionType; + } + + @Column(name="INSSPECTION_MPDE") + public String getInspectionMode() { + return inspectionMode; + } + + public void setInspectionMode(String inspectionMode) { + this.inspectionMode = inspectionMode; + } + + @Column(name="INSPECTION_ROUTE") + public String getInspectionRoute() { + return inspectionRoute; + } + + public void setInspectionRoute(String inspectionRoute) { + this.inspectionRoute = inspectionRoute; + } + + @Column(name="FREQUENCYDATE") + public String getFrequencyDate() { + return frequencyDate; + } + + public void setFrequencyDate(String frequencyDate) { + this.frequencyDate = frequencyDate; + } + + @Column(name="FREQUENCYTIME") + public String getFrequencyTime() { + return frequencyTime; + } + + public void setFrequencyTime(String frequencyTime) { + this.frequencyTime = frequencyTime; + } + + @Column(name="PROJECT") + public String getFroJect() { + return froJect; + } + + public void setFroJect(String froJect) { + this.froJect = froJect; + } + + @Column(name="COMLILE") + public String getComLile() { + return comLile; + } + + public void setComLile(String comLile) { + this.comLile = comLile; + } + + @Column(name="START_TIME") + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + @Column(name="DEVELOP_DEPT") + public String getDevelopDept() { + return developDept; + } + + public void setDevelopDept(String developDept) { + this.developDept = developDept; + } + + @Column(name="END_TIME") + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="INSPECTION_PERSON") + public String getInSpectionPerson() { + return inSpectionPerson; + } + + public void setInSpectionPerson(String inSpectionPerson) { + this.inSpectionPerson = inSpectionPerson; + } + + @Column(name="INSERT_TIME") + public Date getInsertTime() { + return insertTime; + } + + public void setInsertTime(Date insertTime) { + this.insertTime = insertTime; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="INSPECTION_END_TIME") + public String getInSpectionEndTime() { + return inSpectionEndTime; + } + + public void setInSpectionEndTime(String inSpectionEndTime) { + this.inSpectionEndTime = inSpectionEndTime; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="MILEAGE") + public int getMileage() { + return mileage; + } + + public void setMileage(int mileage) { + this.mileage = mileage; + } + + @Column(name="INSPECTION_START_TIME") + public String getInSpectionStartTime() { + return inSpectionStartTime; + } + + public void setInSpectionStartTime(String inSpectionStartTime) { + this.inSpectionStartTime = inSpectionStartTime; + } + + @Column(name="INSPECTION_GROUP") + public String getInSpectionGroup() { + return inSpectionGroup; + } + + public void setInSpectionGroup(String inSpectionGroup) { + this.inSpectionGroup = inSpectionGroup; + } + + @Column(name="END_DATE") + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c71da56..5d45577 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,19 +6,20 @@ - + + + + + + + + + + + + + - - - - - - - - - - - @@ -61,7 +62,7 @@ - + @@ -73,8 +74,8 @@ - - + + @@ -83,10 +84,10 @@ - + - - + + @@ -94,7 +95,7 @@ - + @@ -111,10 +112,111 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,16 +275,6 @@ @@ -263,10 +365,9 @@ - @@ -332,7 +433,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -369,7 +511,7 @@ - + @@ -824,14 +966,7 @@ - - - - 1521168093758 - 1521703079910 @@ -1169,11 +1304,18 @@ - - @@ -1188,7 +1330,7 @@ - + @@ -1200,7 +1342,7 @@ - + @@ -1211,7 +1353,7 @@ - + @@ -1285,7 +1427,6 @@ - @@ -1310,7 +1451,8 @@ - @@ -1340,149 +1482,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1756,8 +1755,287 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java new file mode 100644 index 0000000..483a7a8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -0,0 +1,320 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN") +public class PgAssetInSpectionPlan implements Serializable { + + private String keyId;//唯一键值 + private String planName;//巡检计划名称 + private Date startDate;//巡检开始时间 + private String frequency;//巡检频率 + private int state;//状态 + private String responsibleDept;//负责单位/部门/小组 + private String planNo;//巡检计划编号 + private String inspectionType;//巡检类型 + private String inspectionMode;//巡检方式 + private String inspectionRoute;//巡检路线 + private String frequencyDate;//巡检具体日期 + private String frequencyTime;//巡检具体时间 + private String froJect;//项目 + private String comLile;//编制人 + private Date startTime;//编制时间 + private String developDept;//定制部门 + private Date endTime;//结束时间 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String inSpectionPerson;//巡检人 + private Date insertTime;//插入时间 + private Date createDate;//创建时间 + private String inSpectionEndTime;//巡检结束时间 + private String inSpectionPrace;//巡检地点 + private String creator;//创建人 + private String buildCabin;//巡检舱室 + private int mileage;//null + private String inSpectionStartTime;//巡检开始时间 + private String inSpectionGroup;//巡检部门 + private Date endDate;//null + + /* + * @GeneratedValue注解的strategy提供了四种值 + * AUTO主键由程序控制，是默认选项 + * IDENTITY主键由数据库生成，采用数据库自增长，ORACLE不支持这种方式 + * SEQUENCE通过数据库的序列产生主键，MYSQL不支持； + * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 + * */ + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + @Column(name="START_DATE") + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + @Column(name="FREQUENCY") + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="RESPONSIBLE_DEPT") + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + @Column(name="PLAN_NO") + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + @Column(name="INSPECTION_TYPE") + public String getInspectionType() { + return inspectionType; + } + + public void setInspectionType(String inspectionType) { + this.inspectionType = inspectionType; + } + + @Column(name="INSSPECTION_MPDE") + public String getInspectionMode() { + return inspectionMode; + } + + public void setInspectionMode(String inspectionMode) { + this.inspectionMode = inspectionMode; + } + + @Column(name="INSPECTION_ROUTE") + public String getInspectionRoute() { + return inspectionRoute; + } + + public void setInspectionRoute(String inspectionRoute) { + this.inspectionRoute = inspectionRoute; + } + + @Column(name="FREQUENCYDATE") + public String getFrequencyDate() { + return frequencyDate; + } + + public void setFrequencyDate(String frequencyDate) { + this.frequencyDate = frequencyDate; + } + + @Column(name="FREQUENCYTIME") + public String getFrequencyTime() { + return frequencyTime; + } + + public void setFrequencyTime(String frequencyTime) { + this.frequencyTime = frequencyTime; + } + + @Column(name="PROJECT") + public String getFroJect() { + return froJect; + } + + public void setFroJect(String froJect) { + this.froJect = froJect; + } + + @Column(name="COMLILE") + public String getComLile() { + return comLile; + } + + public void setComLile(String comLile) { + this.comLile = comLile; + } + + @Column(name="START_TIME") + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + @Column(name="DEVELOP_DEPT") + public String getDevelopDept() { + return developDept; + } + + public void setDevelopDept(String developDept) { + this.developDept = developDept; + } + + @Column(name="END_TIME") + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="INSPECTION_PERSON") + public String getInSpectionPerson() { + return inSpectionPerson; + } + + public void setInSpectionPerson(String inSpectionPerson) { + this.inSpectionPerson = inSpectionPerson; + } + + @Column(name="INSERT_TIME") + public Date getInsertTime() { + return insertTime; + } + + public void setInsertTime(Date insertTime) { + this.insertTime = insertTime; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="INSPECTION_END_TIME") + public String getInSpectionEndTime() { + return inSpectionEndTime; + } + + public void setInSpectionEndTime(String inSpectionEndTime) { + this.inSpectionEndTime = inSpectionEndTime; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="MILEAGE") + public int getMileage() { + return mileage; + } + + public void setMileage(int mileage) { + this.mileage = mileage; + } + + @Column(name="INSPECTION_START_TIME") + public String getInSpectionStartTime() { + return inSpectionStartTime; + } + + public void setInSpectionStartTime(String inSpectionStartTime) { + this.inSpectionStartTime = inSpectionStartTime; + } + + @Column(name="INSPECTION_GROUP") + public String getInSpectionGroup() { + return inSpectionGroup; + } + + public void setInSpectionGroup(String inSpectionGroup) { + this.inSpectionGroup = inSpectionGroup; + } + + @Column(name="END_DATE") + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java new file mode 100644 index 0000000..023e5c4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java @@ -0,0 +1,115 @@ +package com.casic.PgInterface.maintenance.domain; + + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN_CONFIG") +public class PgAssetInSpectionPlanConfig implements Serializable { + + private String keyId;//唯一键值 + private String planId;//巡检计划keyID + private String configId;//巡检配置keyId + private String configText;//配置文件内容 + private Date createDate;//创建时间 + private String configModular;//配置模块 + private String creator;//创建人 + private String configNote;//巡检内容说明 + private String stockCategory;//巡检设备二级分类 + private String configClassifiation;//巡检类别 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CONFIG_ID") + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + @Column(name="CONFIG_TEXT") + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="CONFIG_MODULAR") + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="CONFIG_NOTE") + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } + + @Column(name="STOCK_CATEGORY") + public String getStockCategory() { + return stockCategory; + } + + public void setStockCategory(String stockCategory) { + this.stockCategory = stockCategory; + } + + @Column(name="CONFIG_CLASSIFICATION") + public String getConfigClassifiation() { + return configClassifiation; + } + + public void setConfigClassifiation(String configClassifiation) { + this.configClassifiation = configClassifiation; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java new file mode 100644 index 0000000..b1043b0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java @@ -0,0 +1,173 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_RECORD") +public class PgAssetInSpectionRecord implements Serializable { + + private String keyId;//null; + private String planId;//巡检计划keyId + private Date createDate;//创建日期 + private int state;//巡检记录状态 + private String creator;//创建人 + private String patrolMan;//巡检人 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private Date operateDate;//计划巡检日期 + private String remark;//巡检记录 + private String buildCabin;//舱室 + private String inSpectionPrace;//巡检地点 + private String otherPatrolMan;//其他巡检人 + private String recordNo;//记录单号 + private String project;//所属项目 + private String planName;//计划名称 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CREATE_DATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="PATROL_MAN") + public String getPatrolMan() { + return patrolMan; + } + + public void setPatrolMan(String patrolMan) { + this.patrolMan = patrolMan; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="OPERATE_DATE") + public Date getOperateDate() { + return operateDate; + } + + public void setOperateDate(Date operateDate) { + this.operateDate = operateDate; + } + + @Column(name="REMARK") + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="OTHER_PATROL_MAN") + public String getOtherPatrolMan() { + return otherPatrolMan; + } + + public void setOtherPatrolMan(String otherPatrolMan) { + this.otherPatrolMan = otherPatrolMan; + } + + @Column(name="RECORD_NO") + public String getRecordNo() { + return recordNo; + } + + public void setRecordNo(String recordNo) { + this.recordNo = recordNo; + } + + @Column(name="PROJECT") + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + +} \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c71da56..5d45577 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,19 +6,20 @@ - + + + + + + + + + + + + + - - - - - - - - - - - @@ -61,7 +62,7 @@ - + @@ -73,8 +74,8 @@ - - + + @@ -83,10 +84,10 @@ - + - - + + @@ -94,7 +95,7 @@ - + @@ -111,10 +112,111 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,16 +275,6 @@ @@ -263,10 +365,9 @@ - @@ -332,7 +433,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -369,7 +511,7 @@ - + @@ -824,14 +966,7 @@ - - - - 1521168093758 - 1521703079910 @@ -1169,11 +1304,18 @@ - - @@ -1188,7 +1330,7 @@ - + @@ -1200,7 +1342,7 @@ - + @@ -1211,7 +1353,7 @@ - + @@ -1285,7 +1427,6 @@ - @@ -1310,7 +1451,8 @@ - @@ -1340,149 +1482,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1756,8 +1755,287 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java new file mode 100644 index 0000000..483a7a8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -0,0 +1,320 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN") +public class PgAssetInSpectionPlan implements Serializable { + + private String keyId;//唯一键值 + private String planName;//巡检计划名称 + private Date startDate;//巡检开始时间 + private String frequency;//巡检频率 + private int state;//状态 + private String responsibleDept;//负责单位/部门/小组 + private String planNo;//巡检计划编号 + private String inspectionType;//巡检类型 + private String inspectionMode;//巡检方式 + private String inspectionRoute;//巡检路线 + private String frequencyDate;//巡检具体日期 + private String frequencyTime;//巡检具体时间 + private String froJect;//项目 + private String comLile;//编制人 + private Date startTime;//编制时间 + private String developDept;//定制部门 + private Date endTime;//结束时间 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String inSpectionPerson;//巡检人 + private Date insertTime;//插入时间 + private Date createDate;//创建时间 + private String inSpectionEndTime;//巡检结束时间 + private String inSpectionPrace;//巡检地点 + private String creator;//创建人 + private String buildCabin;//巡检舱室 + private int mileage;//null + private String inSpectionStartTime;//巡检开始时间 + private String inSpectionGroup;//巡检部门 + private Date endDate;//null + + /* + * @GeneratedValue注解的strategy提供了四种值 + * AUTO主键由程序控制，是默认选项 + * IDENTITY主键由数据库生成，采用数据库自增长，ORACLE不支持这种方式 + * SEQUENCE通过数据库的序列产生主键，MYSQL不支持； + * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 + * */ + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + @Column(name="START_DATE") + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + @Column(name="FREQUENCY") + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="RESPONSIBLE_DEPT") + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + @Column(name="PLAN_NO") + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + @Column(name="INSPECTION_TYPE") + public String getInspectionType() { + return inspectionType; + } + + public void setInspectionType(String inspectionType) { + this.inspectionType = inspectionType; + } + + @Column(name="INSSPECTION_MPDE") + public String getInspectionMode() { + return inspectionMode; + } + + public void setInspectionMode(String inspectionMode) { + this.inspectionMode = inspectionMode; + } + + @Column(name="INSPECTION_ROUTE") + public String getInspectionRoute() { + return inspectionRoute; + } + + public void setInspectionRoute(String inspectionRoute) { + this.inspectionRoute = inspectionRoute; + } + + @Column(name="FREQUENCYDATE") + public String getFrequencyDate() { + return frequencyDate; + } + + public void setFrequencyDate(String frequencyDate) { + this.frequencyDate = frequencyDate; + } + + @Column(name="FREQUENCYTIME") + public String getFrequencyTime() { + return frequencyTime; + } + + public void setFrequencyTime(String frequencyTime) { + this.frequencyTime = frequencyTime; + } + + @Column(name="PROJECT") + public String getFroJect() { + return froJect; + } + + public void setFroJect(String froJect) { + this.froJect = froJect; + } + + @Column(name="COMLILE") + public String getComLile() { + return comLile; + } + + public void setComLile(String comLile) { + this.comLile = comLile; + } + + @Column(name="START_TIME") + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + @Column(name="DEVELOP_DEPT") + public String getDevelopDept() { + return developDept; + } + + public void setDevelopDept(String developDept) { + this.developDept = developDept; + } + + @Column(name="END_TIME") + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="INSPECTION_PERSON") + public String getInSpectionPerson() { + return inSpectionPerson; + } + + public void setInSpectionPerson(String inSpectionPerson) { + this.inSpectionPerson = inSpectionPerson; + } + + @Column(name="INSERT_TIME") + public Date getInsertTime() { + return insertTime; + } + + public void setInsertTime(Date insertTime) { + this.insertTime = insertTime; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="INSPECTION_END_TIME") + public String getInSpectionEndTime() { + return inSpectionEndTime; + } + + public void setInSpectionEndTime(String inSpectionEndTime) { + this.inSpectionEndTime = inSpectionEndTime; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="MILEAGE") + public int getMileage() { + return mileage; + } + + public void setMileage(int mileage) { + this.mileage = mileage; + } + + @Column(name="INSPECTION_START_TIME") + public String getInSpectionStartTime() { + return inSpectionStartTime; + } + + public void setInSpectionStartTime(String inSpectionStartTime) { + this.inSpectionStartTime = inSpectionStartTime; + } + + @Column(name="INSPECTION_GROUP") + public String getInSpectionGroup() { + return inSpectionGroup; + } + + public void setInSpectionGroup(String inSpectionGroup) { + this.inSpectionGroup = inSpectionGroup; + } + + @Column(name="END_DATE") + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java new file mode 100644 index 0000000..023e5c4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java @@ -0,0 +1,115 @@ +package com.casic.PgInterface.maintenance.domain; + + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN_CONFIG") +public class PgAssetInSpectionPlanConfig implements Serializable { + + private String keyId;//唯一键值 + private String planId;//巡检计划keyID + private String configId;//巡检配置keyId + private String configText;//配置文件内容 + private Date createDate;//创建时间 + private String configModular;//配置模块 + private String creator;//创建人 + private String configNote;//巡检内容说明 + private String stockCategory;//巡检设备二级分类 + private String configClassifiation;//巡检类别 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CONFIG_ID") + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + @Column(name="CONFIG_TEXT") + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="CONFIG_MODULAR") + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="CONFIG_NOTE") + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } + + @Column(name="STOCK_CATEGORY") + public String getStockCategory() { + return stockCategory; + } + + public void setStockCategory(String stockCategory) { + this.stockCategory = stockCategory; + } + + @Column(name="CONFIG_CLASSIFICATION") + public String getConfigClassifiation() { + return configClassifiation; + } + + public void setConfigClassifiation(String configClassifiation) { + this.configClassifiation = configClassifiation; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java new file mode 100644 index 0000000..b1043b0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java @@ -0,0 +1,173 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_RECORD") +public class PgAssetInSpectionRecord implements Serializable { + + private String keyId;//null; + private String planId;//巡检计划keyId + private Date createDate;//创建日期 + private int state;//巡检记录状态 + private String creator;//创建人 + private String patrolMan;//巡检人 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private Date operateDate;//计划巡检日期 + private String remark;//巡检记录 + private String buildCabin;//舱室 + private String inSpectionPrace;//巡检地点 + private String otherPatrolMan;//其他巡检人 + private String recordNo;//记录单号 + private String project;//所属项目 + private String planName;//计划名称 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CREATE_DATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="PATROL_MAN") + public String getPatrolMan() { + return patrolMan; + } + + public void setPatrolMan(String patrolMan) { + this.patrolMan = patrolMan; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="OPERATE_DATE") + public Date getOperateDate() { + return operateDate; + } + + public void setOperateDate(Date operateDate) { + this.operateDate = operateDate; + } + + @Column(name="REMARK") + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="OTHER_PATROL_MAN") + public String getOtherPatrolMan() { + return otherPatrolMan; + } + + public void setOtherPatrolMan(String otherPatrolMan) { + this.otherPatrolMan = otherPatrolMan; + } + + @Column(name="RECORD_NO") + public String getRecordNo() { + return recordNo; + } + + public void setRecordNo(String recordNo) { + this.recordNo = recordNo; + } + + @Column(name="PROJECT") + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java new file mode 100644 index 0000000..51e1f9a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java @@ -0,0 +1,183 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_RECORD_DETAIL") +public class PgAssetInSpectionRecordDetail implements Serializable { + + private String keyId;//null + private String stockKeyId;//设备编号 + private String inspector;//巡检人 + private Date inspectTime;//巡检时间 + private String inspectResult;//巡检情况 + private String inspectAddress;//巡检地点 + private String harm;//发现问题 + private String resolvent;//解决办法 + private String faultApplyId;//故障单keyId + private String configSort;//配置分类 + private String recordId;//巡检记录单id号 + private String configText;//巡检配置项文本 + private Date createDate;//null + private String configId;//巡检配置项id; + private String configModular;//巡检记录单模块 + private String creator;//null + private String configNote;//记录单配置说明 + + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="STOCK_KEY_ID") + public String getStockKeyId() { + return stockKeyId; + } + + public void setStockKeyId(String stockKeyId) { + this.stockKeyId = stockKeyId; + } + + @Column(name="INSPECTOR") + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + @Column(name="INSPECT_TIME") + public Date getInspectTime() { + return inspectTime; + } + + public void setInspectTime(Date inspectTime) { + this.inspectTime = inspectTime; + } + + @Column(name="INSPECT_RESULT") + public String getInspectResult() { + return inspectResult; + } + + public void setInspectResult(String inspectResult) { + this.inspectResult = inspectResult; + } + + @Column(name="INSPECT_ADDRESS") + public String getInspectAddress() { + return inspectAddress; + } + + public void setInspectAddress(String inspectAddress) { + this.inspectAddress = inspectAddress; + } + + @Column(name="HARM") + public String getHarm() { + return harm; + } + + public void setHarm(String harm) { + this.harm = harm; + } + + @Column(name="RESOLVENT") + public String getResolvent() { + return resolvent; + } + + public void setResolvent(String resolvent) { + this.resolvent = resolvent; + } + + @Column(name="FAULT_APPLY_ID") + public String getFaultApplyId() { + return faultApplyId; + } + + public void setFaultApplyId(String faultApplyId) { + this.faultApplyId = faultApplyId; + } + + @Column(name="CONFIG_SORT") + public String getConfigSort() { + return configSort; + } + + public void setConfigSort(String configSort) { + this.configSort = configSort; + } + + @Column(name="RECORD_ID") + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + @Column(name="CONFIG_TEXT") + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="CONFIG_ID") + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + @Column(name="CONFIG_MODULAR") + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="CONFIG_NOTE") + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java new file mode 100644 index 0000000..18a1184 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java @@ -0,0 +1,96 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionPlanConfigDto { + + private String keyId;//唯一键值 + private String planId;//巡检计划keyID + private String configId;//巡检配置keyId + private String configText;//配置文件内容 + private String createDate;//创建时间 + private String configModular;//配置模块 + private String creator;//创建人 + private String configNote;//巡检内容说明 + private String stockCategory;//巡检设备二级分类 + private String configClassifiation;//巡检类别 + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } + + public String getStockCategory() { + return stockCategory; + } + + public void setStockCategory(String stockCategory) { + this.stockCategory = stockCategory; + } + + public String getConfigClassifiation() { + return configClassifiation; + } + + public void setConfigClassifiation(String configClassifiation) { + this.configClassifiation = configClassifiation; + } + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c71da56..5d45577 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,19 +6,20 @@ - + + + + + + + + + + + + + - - - - - - - - - - - @@ -61,7 +62,7 @@ - + @@ -73,8 +74,8 @@ - - + + @@ -83,10 +84,10 @@ - + - - + + @@ -94,7 +95,7 @@ - + @@ -111,10 +112,111 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,16 +275,6 @@ @@ -263,10 +365,9 @@ - @@ -332,7 +433,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -369,7 +511,7 @@ - + @@ -824,14 +966,7 @@ - - - - 1521168093758 - 1521703079910 @@ -1169,11 +1304,18 @@ - - @@ -1188,7 +1330,7 @@ - + @@ -1200,7 +1342,7 @@ - + @@ -1211,7 +1353,7 @@ - + @@ -1285,7 +1427,6 @@ - @@ -1310,7 +1451,8 @@ - @@ -1340,149 +1482,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1756,8 +1755,287 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java new file mode 100644 index 0000000..483a7a8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -0,0 +1,320 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN") +public class PgAssetInSpectionPlan implements Serializable { + + private String keyId;//唯一键值 + private String planName;//巡检计划名称 + private Date startDate;//巡检开始时间 + private String frequency;//巡检频率 + private int state;//状态 + private String responsibleDept;//负责单位/部门/小组 + private String planNo;//巡检计划编号 + private String inspectionType;//巡检类型 + private String inspectionMode;//巡检方式 + private String inspectionRoute;//巡检路线 + private String frequencyDate;//巡检具体日期 + private String frequencyTime;//巡检具体时间 + private String froJect;//项目 + private String comLile;//编制人 + private Date startTime;//编制时间 + private String developDept;//定制部门 + private Date endTime;//结束时间 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String inSpectionPerson;//巡检人 + private Date insertTime;//插入时间 + private Date createDate;//创建时间 + private String inSpectionEndTime;//巡检结束时间 + private String inSpectionPrace;//巡检地点 + private String creator;//创建人 + private String buildCabin;//巡检舱室 + private int mileage;//null + private String inSpectionStartTime;//巡检开始时间 + private String inSpectionGroup;//巡检部门 + private Date endDate;//null + + /* + * @GeneratedValue注解的strategy提供了四种值 + * AUTO主键由程序控制，是默认选项 + * IDENTITY主键由数据库生成，采用数据库自增长，ORACLE不支持这种方式 + * SEQUENCE通过数据库的序列产生主键，MYSQL不支持； + * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 + * */ + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + @Column(name="START_DATE") + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + @Column(name="FREQUENCY") + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="RESPONSIBLE_DEPT") + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + @Column(name="PLAN_NO") + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + @Column(name="INSPECTION_TYPE") + public String getInspectionType() { + return inspectionType; + } + + public void setInspectionType(String inspectionType) { + this.inspectionType = inspectionType; + } + + @Column(name="INSSPECTION_MPDE") + public String getInspectionMode() { + return inspectionMode; + } + + public void setInspectionMode(String inspectionMode) { + this.inspectionMode = inspectionMode; + } + + @Column(name="INSPECTION_ROUTE") + public String getInspectionRoute() { + return inspectionRoute; + } + + public void setInspectionRoute(String inspectionRoute) { + this.inspectionRoute = inspectionRoute; + } + + @Column(name="FREQUENCYDATE") + public String getFrequencyDate() { + return frequencyDate; + } + + public void setFrequencyDate(String frequencyDate) { + this.frequencyDate = frequencyDate; + } + + @Column(name="FREQUENCYTIME") + public String getFrequencyTime() { + return frequencyTime; + } + + public void setFrequencyTime(String frequencyTime) { + this.frequencyTime = frequencyTime; + } + + @Column(name="PROJECT") + public String getFroJect() { + return froJect; + } + + public void setFroJect(String froJect) { + this.froJect = froJect; + } + + @Column(name="COMLILE") + public String getComLile() { + return comLile; + } + + public void setComLile(String comLile) { + this.comLile = comLile; + } + + @Column(name="START_TIME") + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + @Column(name="DEVELOP_DEPT") + public String getDevelopDept() { + return developDept; + } + + public void setDevelopDept(String developDept) { + this.developDept = developDept; + } + + @Column(name="END_TIME") + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="INSPECTION_PERSON") + public String getInSpectionPerson() { + return inSpectionPerson; + } + + public void setInSpectionPerson(String inSpectionPerson) { + this.inSpectionPerson = inSpectionPerson; + } + + @Column(name="INSERT_TIME") + public Date getInsertTime() { + return insertTime; + } + + public void setInsertTime(Date insertTime) { + this.insertTime = insertTime; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="INSPECTION_END_TIME") + public String getInSpectionEndTime() { + return inSpectionEndTime; + } + + public void setInSpectionEndTime(String inSpectionEndTime) { + this.inSpectionEndTime = inSpectionEndTime; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="MILEAGE") + public int getMileage() { + return mileage; + } + + public void setMileage(int mileage) { + this.mileage = mileage; + } + + @Column(name="INSPECTION_START_TIME") + public String getInSpectionStartTime() { + return inSpectionStartTime; + } + + public void setInSpectionStartTime(String inSpectionStartTime) { + this.inSpectionStartTime = inSpectionStartTime; + } + + @Column(name="INSPECTION_GROUP") + public String getInSpectionGroup() { + return inSpectionGroup; + } + + public void setInSpectionGroup(String inSpectionGroup) { + this.inSpectionGroup = inSpectionGroup; + } + + @Column(name="END_DATE") + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java new file mode 100644 index 0000000..023e5c4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java @@ -0,0 +1,115 @@ +package com.casic.PgInterface.maintenance.domain; + + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN_CONFIG") +public class PgAssetInSpectionPlanConfig implements Serializable { + + private String keyId;//唯一键值 + private String planId;//巡检计划keyID + private String configId;//巡检配置keyId + private String configText;//配置文件内容 + private Date createDate;//创建时间 + private String configModular;//配置模块 + private String creator;//创建人 + private String configNote;//巡检内容说明 + private String stockCategory;//巡检设备二级分类 + private String configClassifiation;//巡检类别 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CONFIG_ID") + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + @Column(name="CONFIG_TEXT") + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="CONFIG_MODULAR") + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="CONFIG_NOTE") + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } + + @Column(name="STOCK_CATEGORY") + public String getStockCategory() { + return stockCategory; + } + + public void setStockCategory(String stockCategory) { + this.stockCategory = stockCategory; + } + + @Column(name="CONFIG_CLASSIFICATION") + public String getConfigClassifiation() { + return configClassifiation; + } + + public void setConfigClassifiation(String configClassifiation) { + this.configClassifiation = configClassifiation; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java new file mode 100644 index 0000000..b1043b0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java @@ -0,0 +1,173 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_RECORD") +public class PgAssetInSpectionRecord implements Serializable { + + private String keyId;//null; + private String planId;//巡检计划keyId + private Date createDate;//创建日期 + private int state;//巡检记录状态 + private String creator;//创建人 + private String patrolMan;//巡检人 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private Date operateDate;//计划巡检日期 + private String remark;//巡检记录 + private String buildCabin;//舱室 + private String inSpectionPrace;//巡检地点 + private String otherPatrolMan;//其他巡检人 + private String recordNo;//记录单号 + private String project;//所属项目 + private String planName;//计划名称 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CREATE_DATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="PATROL_MAN") + public String getPatrolMan() { + return patrolMan; + } + + public void setPatrolMan(String patrolMan) { + this.patrolMan = patrolMan; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="OPERATE_DATE") + public Date getOperateDate() { + return operateDate; + } + + public void setOperateDate(Date operateDate) { + this.operateDate = operateDate; + } + + @Column(name="REMARK") + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="OTHER_PATROL_MAN") + public String getOtherPatrolMan() { + return otherPatrolMan; + } + + public void setOtherPatrolMan(String otherPatrolMan) { + this.otherPatrolMan = otherPatrolMan; + } + + @Column(name="RECORD_NO") + public String getRecordNo() { + return recordNo; + } + + public void setRecordNo(String recordNo) { + this.recordNo = recordNo; + } + + @Column(name="PROJECT") + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java new file mode 100644 index 0000000..51e1f9a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java @@ -0,0 +1,183 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_RECORD_DETAIL") +public class PgAssetInSpectionRecordDetail implements Serializable { + + private String keyId;//null + private String stockKeyId;//设备编号 + private String inspector;//巡检人 + private Date inspectTime;//巡检时间 + private String inspectResult;//巡检情况 + private String inspectAddress;//巡检地点 + private String harm;//发现问题 + private String resolvent;//解决办法 + private String faultApplyId;//故障单keyId + private String configSort;//配置分类 + private String recordId;//巡检记录单id号 + private String configText;//巡检配置项文本 + private Date createDate;//null + private String configId;//巡检配置项id; + private String configModular;//巡检记录单模块 + private String creator;//null + private String configNote;//记录单配置说明 + + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="STOCK_KEY_ID") + public String getStockKeyId() { + return stockKeyId; + } + + public void setStockKeyId(String stockKeyId) { + this.stockKeyId = stockKeyId; + } + + @Column(name="INSPECTOR") + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + @Column(name="INSPECT_TIME") + public Date getInspectTime() { + return inspectTime; + } + + public void setInspectTime(Date inspectTime) { + this.inspectTime = inspectTime; + } + + @Column(name="INSPECT_RESULT") + public String getInspectResult() { + return inspectResult; + } + + public void setInspectResult(String inspectResult) { + this.inspectResult = inspectResult; + } + + @Column(name="INSPECT_ADDRESS") + public String getInspectAddress() { + return inspectAddress; + } + + public void setInspectAddress(String inspectAddress) { + this.inspectAddress = inspectAddress; + } + + @Column(name="HARM") + public String getHarm() { + return harm; + } + + public void setHarm(String harm) { + this.harm = harm; + } + + @Column(name="RESOLVENT") + public String getResolvent() { + return resolvent; + } + + public void setResolvent(String resolvent) { + this.resolvent = resolvent; + } + + @Column(name="FAULT_APPLY_ID") + public String getFaultApplyId() { + return faultApplyId; + } + + public void setFaultApplyId(String faultApplyId) { + this.faultApplyId = faultApplyId; + } + + @Column(name="CONFIG_SORT") + public String getConfigSort() { + return configSort; + } + + public void setConfigSort(String configSort) { + this.configSort = configSort; + } + + @Column(name="RECORD_ID") + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + @Column(name="CONFIG_TEXT") + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="CONFIG_ID") + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + @Column(name="CONFIG_MODULAR") + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="CONFIG_NOTE") + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java new file mode 100644 index 0000000..18a1184 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java @@ -0,0 +1,96 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionPlanConfigDto { + + private String keyId;//唯一键值 + private String planId;//巡检计划keyID + private String configId;//巡检配置keyId + private String configText;//配置文件内容 + private String createDate;//创建时间 + private String configModular;//配置模块 + private String creator;//创建人 + private String configNote;//巡检内容说明 + private String stockCategory;//巡检设备二级分类 + private String configClassifiation;//巡检类别 + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } + + public String getStockCategory() { + return stockCategory; + } + + public void setStockCategory(String stockCategory) { + this.stockCategory = stockCategory; + } + + public String getConfigClassifiation() { + return configClassifiation; + } + + public void setConfigClassifiation(String configClassifiation) { + this.configClassifiation = configClassifiation; + } + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java new file mode 100644 index 0000000..cb4b6f9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java @@ -0,0 +1,277 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionPlanDto { + + private String keyId;//唯一键值 + private String planName;//巡检计划名称 + private String startDate;//巡检开始时间Date + private String frequency;//巡检频率 + private String state;//状态int + private String responsibleDept;//负责单位/部门/小组 + private String planNo;//巡检计划编号 + private String inspectionType;//巡检类型 + private String inspectionMode;//巡检方式 + private String inspectionRoute;//巡检路线 + private String frequencyDate;//巡检具体日期 + private String frequencyTime;//巡检具体时间 + private String froJect;//项目 + private String comLile;//编制人 + private String startTime;//编制时间Date + private String developDept;//定制部门 + private String endTime;//结束时间Date + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String inSpectionPerson;//巡检人 + private String insertTime;//插入时间Date + private String createDate;//创建时间Date + private String inSpectionEndTime;//巡检结束时间 + private String inSpectionPrace;//巡检地点 + private String creator;//创建人 + private String buildCabin;//巡检舱室 + private String mileage;//int + private String inSpectionStartTime;//巡检开始时间 + private String inSpectionGroup;//巡检部门 + private String endDate;//Date + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + public String getInspectionType() { + return inspectionType; + } + + public void setInspectionType(String inspectionType) { + this.inspectionType = inspectionType; + } + + public String getInspectionMode() { + return inspectionMode; + } + + public void setInspectionMode(String inspectionMode) { + this.inspectionMode = inspectionMode; + } + + public String getInspectionRoute() { + return inspectionRoute; + } + + public void setInspectionRoute(String inspectionRoute) { + this.inspectionRoute = inspectionRoute; + } + + public String getFrequencyDate() { + return frequencyDate; + } + + public void setFrequencyDate(String frequencyDate) { + this.frequencyDate = frequencyDate; + } + + public String getFrequencyTime() { + return frequencyTime; + } + + public void setFrequencyTime(String frequencyTime) { + this.frequencyTime = frequencyTime; + } + + public String getFroJect() { + return froJect; + } + + public void setFroJect(String froJect) { + this.froJect = froJect; + } + + public String getComLile() { + return comLile; + } + + public void setComLile(String comLile) { + this.comLile = comLile; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getDevelopDept() { + return developDept; + } + + public void setDevelopDept(String developDept) { + this.developDept = developDept; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + public String getInSpectionPerson() { + return inSpectionPerson; + } + + public void setInSpectionPerson(String inSpectionPerson) { + this.inSpectionPerson = inSpectionPerson; + } + + public String getInsertTime() { + return insertTime; + } + + public void setInsertTime(String insertTime) { + this.insertTime = insertTime; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getInSpectionEndTime() { + return inSpectionEndTime; + } + + public void setInSpectionEndTime(String inSpectionEndTime) { + this.inSpectionEndTime = inSpectionEndTime; + } + + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + public String getMileage() { + return mileage; + } + + public void setMileage(String mileage) { + this.mileage = mileage; + } + + public String getInSpectionStartTime() { + return inSpectionStartTime; + } + + public void setInSpectionStartTime(String inSpectionStartTime) { + this.inSpectionStartTime = inSpectionStartTime; + } + + public String getInSpectionGroup() { + return inSpectionGroup; + } + + public void setInSpectionGroup(String inSpectionGroup) { + this.inSpectionGroup = inSpectionGroup; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java new file mode 100644 index 0000000..a1d961e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionRecordDetailDto { + + private String keyId;//null + private String stockKeyId;//设备编号 + private String inspector;//巡检人 + private String inspectTime;//巡检时间 + private String inspectResult;//巡检情况 + private String inspectAddress;//巡检地点 + private String harm;//发现问题 + private String resolvent;//解决办法 + private String faultApplyId;//故障单keyId + private String configSort;//配置分类 + private String recordId;//巡检记录单id号 + private String configText;//巡检配置项文本 + private String createDate;//null + private String configId;//巡检配置项id; + private String configModular;//巡检记录单模块 + private String creator;//null + private String configNote;//记录单配置说明 + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getStockKeyId() { + return stockKeyId; + } + + public void setStockKeyId(String stockKeyId) { + this.stockKeyId = stockKeyId; + } + + + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + public String getInspectTime() { + return inspectTime; + } + + public void setInspectTime(String inspectTime) { + this.inspectTime = inspectTime; + } + + + public String getInspectResult() { + return inspectResult; + } + + public void setInspectResult(String inspectResult) { + this.inspectResult = inspectResult; + } + + public String getInspectAddress() { + return inspectAddress; + } + + public void setInspectAddress(String inspectAddress) { + this.inspectAddress = inspectAddress; + } + + public String getHarm() { + return harm; + } + + public void setHarm(String harm) { + this.harm = harm; + } + + public String getResolvent() { + return resolvent; + } + + public void setResolvent(String resolvent) { + this.resolvent = resolvent; + } + + + public String getFaultApplyId() { + return faultApplyId; + } + + public void setFaultApplyId(String faultApplyId) { + this.faultApplyId = faultApplyId; + } + + public String getConfigSort() { + return configSort; + } + + public void setConfigSort(String configSort) { + this.configSort = configSort; + } + + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } +} + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c71da56..5d45577 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,19 +6,20 @@ - + + + + + + + + + + + + + - - - - - - - - - - - @@ -61,7 +62,7 @@ - + @@ -73,8 +74,8 @@ - - + + @@ -83,10 +84,10 @@ - + - - + + @@ -94,7 +95,7 @@ - + @@ -111,10 +112,111 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,16 +275,6 @@ @@ -263,10 +365,9 @@ - @@ -332,7 +433,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -369,7 +511,7 @@ - + @@ -824,14 +966,7 @@ - - - - 1521168093758 - 1521703079910 @@ -1169,11 +1304,18 @@ - - @@ -1188,7 +1330,7 @@ - + @@ -1200,7 +1342,7 @@ - + @@ -1211,7 +1353,7 @@ - + @@ -1285,7 +1427,6 @@ - @@ -1310,7 +1451,8 @@ - @@ -1340,149 +1482,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1756,8 +1755,287 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java new file mode 100644 index 0000000..483a7a8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -0,0 +1,320 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN") +public class PgAssetInSpectionPlan implements Serializable { + + private String keyId;//唯一键值 + private String planName;//巡检计划名称 + private Date startDate;//巡检开始时间 + private String frequency;//巡检频率 + private int state;//状态 + private String responsibleDept;//负责单位/部门/小组 + private String planNo;//巡检计划编号 + private String inspectionType;//巡检类型 + private String inspectionMode;//巡检方式 + private String inspectionRoute;//巡检路线 + private String frequencyDate;//巡检具体日期 + private String frequencyTime;//巡检具体时间 + private String froJect;//项目 + private String comLile;//编制人 + private Date startTime;//编制时间 + private String developDept;//定制部门 + private Date endTime;//结束时间 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String inSpectionPerson;//巡检人 + private Date insertTime;//插入时间 + private Date createDate;//创建时间 + private String inSpectionEndTime;//巡检结束时间 + private String inSpectionPrace;//巡检地点 + private String creator;//创建人 + private String buildCabin;//巡检舱室 + private int mileage;//null + private String inSpectionStartTime;//巡检开始时间 + private String inSpectionGroup;//巡检部门 + private Date endDate;//null + + /* + * @GeneratedValue注解的strategy提供了四种值 + * AUTO主键由程序控制，是默认选项 + * IDENTITY主键由数据库生成，采用数据库自增长，ORACLE不支持这种方式 + * SEQUENCE通过数据库的序列产生主键，MYSQL不支持； + * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 + * */ + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + @Column(name="START_DATE") + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + @Column(name="FREQUENCY") + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="RESPONSIBLE_DEPT") + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + @Column(name="PLAN_NO") + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + @Column(name="INSPECTION_TYPE") + public String getInspectionType() { + return inspectionType; + } + + public void setInspectionType(String inspectionType) { + this.inspectionType = inspectionType; + } + + @Column(name="INSSPECTION_MPDE") + public String getInspectionMode() { + return inspectionMode; + } + + public void setInspectionMode(String inspectionMode) { + this.inspectionMode = inspectionMode; + } + + @Column(name="INSPECTION_ROUTE") + public String getInspectionRoute() { + return inspectionRoute; + } + + public void setInspectionRoute(String inspectionRoute) { + this.inspectionRoute = inspectionRoute; + } + + @Column(name="FREQUENCYDATE") + public String getFrequencyDate() { + return frequencyDate; + } + + public void setFrequencyDate(String frequencyDate) { + this.frequencyDate = frequencyDate; + } + + @Column(name="FREQUENCYTIME") + public String getFrequencyTime() { + return frequencyTime; + } + + public void setFrequencyTime(String frequencyTime) { + this.frequencyTime = frequencyTime; + } + + @Column(name="PROJECT") + public String getFroJect() { + return froJect; + } + + public void setFroJect(String froJect) { + this.froJect = froJect; + } + + @Column(name="COMLILE") + public String getComLile() { + return comLile; + } + + public void setComLile(String comLile) { + this.comLile = comLile; + } + + @Column(name="START_TIME") + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + @Column(name="DEVELOP_DEPT") + public String getDevelopDept() { + return developDept; + } + + public void setDevelopDept(String developDept) { + this.developDept = developDept; + } + + @Column(name="END_TIME") + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="INSPECTION_PERSON") + public String getInSpectionPerson() { + return inSpectionPerson; + } + + public void setInSpectionPerson(String inSpectionPerson) { + this.inSpectionPerson = inSpectionPerson; + } + + @Column(name="INSERT_TIME") + public Date getInsertTime() { + return insertTime; + } + + public void setInsertTime(Date insertTime) { + this.insertTime = insertTime; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="INSPECTION_END_TIME") + public String getInSpectionEndTime() { + return inSpectionEndTime; + } + + public void setInSpectionEndTime(String inSpectionEndTime) { + this.inSpectionEndTime = inSpectionEndTime; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="MILEAGE") + public int getMileage() { + return mileage; + } + + public void setMileage(int mileage) { + this.mileage = mileage; + } + + @Column(name="INSPECTION_START_TIME") + public String getInSpectionStartTime() { + return inSpectionStartTime; + } + + public void setInSpectionStartTime(String inSpectionStartTime) { + this.inSpectionStartTime = inSpectionStartTime; + } + + @Column(name="INSPECTION_GROUP") + public String getInSpectionGroup() { + return inSpectionGroup; + } + + public void setInSpectionGroup(String inSpectionGroup) { + this.inSpectionGroup = inSpectionGroup; + } + + @Column(name="END_DATE") + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java new file mode 100644 index 0000000..023e5c4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java @@ -0,0 +1,115 @@ +package com.casic.PgInterface.maintenance.domain; + + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN_CONFIG") +public class PgAssetInSpectionPlanConfig implements Serializable { + + private String keyId;//唯一键值 + private String planId;//巡检计划keyID + private String configId;//巡检配置keyId + private String configText;//配置文件内容 + private Date createDate;//创建时间 + private String configModular;//配置模块 + private String creator;//创建人 + private String configNote;//巡检内容说明 + private String stockCategory;//巡检设备二级分类 + private String configClassifiation;//巡检类别 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CONFIG_ID") + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + @Column(name="CONFIG_TEXT") + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="CONFIG_MODULAR") + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="CONFIG_NOTE") + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } + + @Column(name="STOCK_CATEGORY") + public String getStockCategory() { + return stockCategory; + } + + public void setStockCategory(String stockCategory) { + this.stockCategory = stockCategory; + } + + @Column(name="CONFIG_CLASSIFICATION") + public String getConfigClassifiation() { + return configClassifiation; + } + + public void setConfigClassifiation(String configClassifiation) { + this.configClassifiation = configClassifiation; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java new file mode 100644 index 0000000..b1043b0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java @@ -0,0 +1,173 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_RECORD") +public class PgAssetInSpectionRecord implements Serializable { + + private String keyId;//null; + private String planId;//巡检计划keyId + private Date createDate;//创建日期 + private int state;//巡检记录状态 + private String creator;//创建人 + private String patrolMan;//巡检人 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private Date operateDate;//计划巡检日期 + private String remark;//巡检记录 + private String buildCabin;//舱室 + private String inSpectionPrace;//巡检地点 + private String otherPatrolMan;//其他巡检人 + private String recordNo;//记录单号 + private String project;//所属项目 + private String planName;//计划名称 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CREATE_DATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="PATROL_MAN") + public String getPatrolMan() { + return patrolMan; + } + + public void setPatrolMan(String patrolMan) { + this.patrolMan = patrolMan; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="OPERATE_DATE") + public Date getOperateDate() { + return operateDate; + } + + public void setOperateDate(Date operateDate) { + this.operateDate = operateDate; + } + + @Column(name="REMARK") + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="OTHER_PATROL_MAN") + public String getOtherPatrolMan() { + return otherPatrolMan; + } + + public void setOtherPatrolMan(String otherPatrolMan) { + this.otherPatrolMan = otherPatrolMan; + } + + @Column(name="RECORD_NO") + public String getRecordNo() { + return recordNo; + } + + public void setRecordNo(String recordNo) { + this.recordNo = recordNo; + } + + @Column(name="PROJECT") + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java new file mode 100644 index 0000000..51e1f9a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java @@ -0,0 +1,183 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_RECORD_DETAIL") +public class PgAssetInSpectionRecordDetail implements Serializable { + + private String keyId;//null + private String stockKeyId;//设备编号 + private String inspector;//巡检人 + private Date inspectTime;//巡检时间 + private String inspectResult;//巡检情况 + private String inspectAddress;//巡检地点 + private String harm;//发现问题 + private String resolvent;//解决办法 + private String faultApplyId;//故障单keyId + private String configSort;//配置分类 + private String recordId;//巡检记录单id号 + private String configText;//巡检配置项文本 + private Date createDate;//null + private String configId;//巡检配置项id; + private String configModular;//巡检记录单模块 + private String creator;//null + private String configNote;//记录单配置说明 + + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="STOCK_KEY_ID") + public String getStockKeyId() { + return stockKeyId; + } + + public void setStockKeyId(String stockKeyId) { + this.stockKeyId = stockKeyId; + } + + @Column(name="INSPECTOR") + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + @Column(name="INSPECT_TIME") + public Date getInspectTime() { + return inspectTime; + } + + public void setInspectTime(Date inspectTime) { + this.inspectTime = inspectTime; + } + + @Column(name="INSPECT_RESULT") + public String getInspectResult() { + return inspectResult; + } + + public void setInspectResult(String inspectResult) { + this.inspectResult = inspectResult; + } + + @Column(name="INSPECT_ADDRESS") + public String getInspectAddress() { + return inspectAddress; + } + + public void setInspectAddress(String inspectAddress) { + this.inspectAddress = inspectAddress; + } + + @Column(name="HARM") + public String getHarm() { + return harm; + } + + public void setHarm(String harm) { + this.harm = harm; + } + + @Column(name="RESOLVENT") + public String getResolvent() { + return resolvent; + } + + public void setResolvent(String resolvent) { + this.resolvent = resolvent; + } + + @Column(name="FAULT_APPLY_ID") + public String getFaultApplyId() { + return faultApplyId; + } + + public void setFaultApplyId(String faultApplyId) { + this.faultApplyId = faultApplyId; + } + + @Column(name="CONFIG_SORT") + public String getConfigSort() { + return configSort; + } + + public void setConfigSort(String configSort) { + this.configSort = configSort; + } + + @Column(name="RECORD_ID") + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + @Column(name="CONFIG_TEXT") + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="CONFIG_ID") + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + @Column(name="CONFIG_MODULAR") + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="CONFIG_NOTE") + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java new file mode 100644 index 0000000..18a1184 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java @@ -0,0 +1,96 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionPlanConfigDto { + + private String keyId;//唯一键值 + private String planId;//巡检计划keyID + private String configId;//巡检配置keyId + private String configText;//配置文件内容 + private String createDate;//创建时间 + private String configModular;//配置模块 + private String creator;//创建人 + private String configNote;//巡检内容说明 + private String stockCategory;//巡检设备二级分类 + private String configClassifiation;//巡检类别 + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } + + public String getStockCategory() { + return stockCategory; + } + + public void setStockCategory(String stockCategory) { + this.stockCategory = stockCategory; + } + + public String getConfigClassifiation() { + return configClassifiation; + } + + public void setConfigClassifiation(String configClassifiation) { + this.configClassifiation = configClassifiation; + } + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java new file mode 100644 index 0000000..cb4b6f9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java @@ -0,0 +1,277 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionPlanDto { + + private String keyId;//唯一键值 + private String planName;//巡检计划名称 + private String startDate;//巡检开始时间Date + private String frequency;//巡检频率 + private String state;//状态int + private String responsibleDept;//负责单位/部门/小组 + private String planNo;//巡检计划编号 + private String inspectionType;//巡检类型 + private String inspectionMode;//巡检方式 + private String inspectionRoute;//巡检路线 + private String frequencyDate;//巡检具体日期 + private String frequencyTime;//巡检具体时间 + private String froJect;//项目 + private String comLile;//编制人 + private String startTime;//编制时间Date + private String developDept;//定制部门 + private String endTime;//结束时间Date + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String inSpectionPerson;//巡检人 + private String insertTime;//插入时间Date + private String createDate;//创建时间Date + private String inSpectionEndTime;//巡检结束时间 + private String inSpectionPrace;//巡检地点 + private String creator;//创建人 + private String buildCabin;//巡检舱室 + private String mileage;//int + private String inSpectionStartTime;//巡检开始时间 + private String inSpectionGroup;//巡检部门 + private String endDate;//Date + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + public String getInspectionType() { + return inspectionType; + } + + public void setInspectionType(String inspectionType) { + this.inspectionType = inspectionType; + } + + public String getInspectionMode() { + return inspectionMode; + } + + public void setInspectionMode(String inspectionMode) { + this.inspectionMode = inspectionMode; + } + + public String getInspectionRoute() { + return inspectionRoute; + } + + public void setInspectionRoute(String inspectionRoute) { + this.inspectionRoute = inspectionRoute; + } + + public String getFrequencyDate() { + return frequencyDate; + } + + public void setFrequencyDate(String frequencyDate) { + this.frequencyDate = frequencyDate; + } + + public String getFrequencyTime() { + return frequencyTime; + } + + public void setFrequencyTime(String frequencyTime) { + this.frequencyTime = frequencyTime; + } + + public String getFroJect() { + return froJect; + } + + public void setFroJect(String froJect) { + this.froJect = froJect; + } + + public String getComLile() { + return comLile; + } + + public void setComLile(String comLile) { + this.comLile = comLile; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getDevelopDept() { + return developDept; + } + + public void setDevelopDept(String developDept) { + this.developDept = developDept; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + public String getInSpectionPerson() { + return inSpectionPerson; + } + + public void setInSpectionPerson(String inSpectionPerson) { + this.inSpectionPerson = inSpectionPerson; + } + + public String getInsertTime() { + return insertTime; + } + + public void setInsertTime(String insertTime) { + this.insertTime = insertTime; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getInSpectionEndTime() { + return inSpectionEndTime; + } + + public void setInSpectionEndTime(String inSpectionEndTime) { + this.inSpectionEndTime = inSpectionEndTime; + } + + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + public String getMileage() { + return mileage; + } + + public void setMileage(String mileage) { + this.mileage = mileage; + } + + public String getInSpectionStartTime() { + return inSpectionStartTime; + } + + public void setInSpectionStartTime(String inSpectionStartTime) { + this.inSpectionStartTime = inSpectionStartTime; + } + + public String getInSpectionGroup() { + return inSpectionGroup; + } + + public void setInSpectionGroup(String inSpectionGroup) { + this.inSpectionGroup = inSpectionGroup; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java new file mode 100644 index 0000000..a1d961e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionRecordDetailDto { + + private String keyId;//null + private String stockKeyId;//设备编号 + private String inspector;//巡检人 + private String inspectTime;//巡检时间 + private String inspectResult;//巡检情况 + private String inspectAddress;//巡检地点 + private String harm;//发现问题 + private String resolvent;//解决办法 + private String faultApplyId;//故障单keyId + private String configSort;//配置分类 + private String recordId;//巡检记录单id号 + private String configText;//巡检配置项文本 + private String createDate;//null + private String configId;//巡检配置项id; + private String configModular;//巡检记录单模块 + private String creator;//null + private String configNote;//记录单配置说明 + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getStockKeyId() { + return stockKeyId; + } + + public void setStockKeyId(String stockKeyId) { + this.stockKeyId = stockKeyId; + } + + + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + public String getInspectTime() { + return inspectTime; + } + + public void setInspectTime(String inspectTime) { + this.inspectTime = inspectTime; + } + + + public String getInspectResult() { + return inspectResult; + } + + public void setInspectResult(String inspectResult) { + this.inspectResult = inspectResult; + } + + public String getInspectAddress() { + return inspectAddress; + } + + public void setInspectAddress(String inspectAddress) { + this.inspectAddress = inspectAddress; + } + + public String getHarm() { + return harm; + } + + public void setHarm(String harm) { + this.harm = harm; + } + + public String getResolvent() { + return resolvent; + } + + public void setResolvent(String resolvent) { + this.resolvent = resolvent; + } + + + public String getFaultApplyId() { + return faultApplyId; + } + + public void setFaultApplyId(String faultApplyId) { + this.faultApplyId = faultApplyId; + } + + public String getConfigSort() { + return configSort; + } + + public void setConfigSort(String configSort) { + this.configSort = configSort; + } + + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } +} + diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java new file mode 100644 index 0000000..72bfeed --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java @@ -0,0 +1,148 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionRecordDto { + private String keyId;//null; + private String planId;//巡检计划keyId + private String createDate;//创建日期 + private String state;//巡检记录状态 + private String creator;//创建人 + private String patrolMan;//巡检人 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String operateDate;//计划巡检日期 + private String remark;//巡检记录 + private String buildCabin;//舱室 + private String inSpectionPrace;//巡检地点 + private String otherPatrolMan;//其他巡检人 + private String recordNo;//记录单号 + private String project;//所属项目 + private String planName;//计划名称 + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getPatrolMan() { + return patrolMan; + } + + public void setPatrolMan(String patrolMan) { + this.patrolMan = patrolMan; + } + + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + public String getOperateDate() { + return operateDate; + } + + public void setOperateDate(String operateDate) { + this.operateDate = operateDate; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + public String getOtherPatrolMan() { + return otherPatrolMan; + } + + public void setOtherPatrolMan(String otherPatrolMan) { + this.otherPatrolMan = otherPatrolMan; + } + + public String getRecordNo() { + return recordNo; + } + + public void setRecordNo(String recordNo) { + this.recordNo = recordNo; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionPlanConfigManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionPlanConfigManager.java new file mode 100644 index 0000000..7d2c502 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionPlanConfigManager.java @@ -0,0 +1,6 @@ +package com.casic.PgInterface.maintenance.manager; + +public class PgAssetInSpectionPlanConfigManager { + + +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c71da56..5d45577 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,19 +6,20 @@ - + + + + + + + + + + + + + - - - - - - - - - - - @@ -61,7 +62,7 @@ - + @@ -73,8 +74,8 @@ - - + + @@ -83,10 +84,10 @@ - + - - + + @@ -94,7 +95,7 @@ - + @@ -111,10 +112,111 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,16 +275,6 @@ @@ -263,10 +365,9 @@ - @@ -332,7 +433,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -369,7 +511,7 @@ - + @@ -824,14 +966,7 @@ - - - - 1521168093758 - 1521703079910 @@ -1169,11 +1304,18 @@ - - @@ -1188,7 +1330,7 @@ - + @@ -1200,7 +1342,7 @@ - + @@ -1211,7 +1353,7 @@ - + @@ -1285,7 +1427,6 @@ - @@ -1310,7 +1451,8 @@ - @@ -1340,149 +1482,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1756,8 +1755,287 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java new file mode 100644 index 0000000..483a7a8 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlan.java @@ -0,0 +1,320 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN") +public class PgAssetInSpectionPlan implements Serializable { + + private String keyId;//唯一键值 + private String planName;//巡检计划名称 + private Date startDate;//巡检开始时间 + private String frequency;//巡检频率 + private int state;//状态 + private String responsibleDept;//负责单位/部门/小组 + private String planNo;//巡检计划编号 + private String inspectionType;//巡检类型 + private String inspectionMode;//巡检方式 + private String inspectionRoute;//巡检路线 + private String frequencyDate;//巡检具体日期 + private String frequencyTime;//巡检具体时间 + private String froJect;//项目 + private String comLile;//编制人 + private Date startTime;//编制时间 + private String developDept;//定制部门 + private Date endTime;//结束时间 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String inSpectionPerson;//巡检人 + private Date insertTime;//插入时间 + private Date createDate;//创建时间 + private String inSpectionEndTime;//巡检结束时间 + private String inSpectionPrace;//巡检地点 + private String creator;//创建人 + private String buildCabin;//巡检舱室 + private int mileage;//null + private String inSpectionStartTime;//巡检开始时间 + private String inSpectionGroup;//巡检部门 + private Date endDate;//null + + /* + * @GeneratedValue注解的strategy提供了四种值 + * AUTO主键由程序控制，是默认选项 + * IDENTITY主键由数据库生成，采用数据库自增长，ORACLE不支持这种方式 + * SEQUENCE通过数据库的序列产生主键，MYSQL不支持； + * TABLE提供特定的数据库产生主键，该方式更有利于数据库的移植 + * */ + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + @Column(name="START_DATE") + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + @Column(name="FREQUENCY") + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="RESPONSIBLE_DEPT") + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + @Column(name="PLAN_NO") + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + @Column(name="INSPECTION_TYPE") + public String getInspectionType() { + return inspectionType; + } + + public void setInspectionType(String inspectionType) { + this.inspectionType = inspectionType; + } + + @Column(name="INSSPECTION_MPDE") + public String getInspectionMode() { + return inspectionMode; + } + + public void setInspectionMode(String inspectionMode) { + this.inspectionMode = inspectionMode; + } + + @Column(name="INSPECTION_ROUTE") + public String getInspectionRoute() { + return inspectionRoute; + } + + public void setInspectionRoute(String inspectionRoute) { + this.inspectionRoute = inspectionRoute; + } + + @Column(name="FREQUENCYDATE") + public String getFrequencyDate() { + return frequencyDate; + } + + public void setFrequencyDate(String frequencyDate) { + this.frequencyDate = frequencyDate; + } + + @Column(name="FREQUENCYTIME") + public String getFrequencyTime() { + return frequencyTime; + } + + public void setFrequencyTime(String frequencyTime) { + this.frequencyTime = frequencyTime; + } + + @Column(name="PROJECT") + public String getFroJect() { + return froJect; + } + + public void setFroJect(String froJect) { + this.froJect = froJect; + } + + @Column(name="COMLILE") + public String getComLile() { + return comLile; + } + + public void setComLile(String comLile) { + this.comLile = comLile; + } + + @Column(name="START_TIME") + public Date getStartTime() { + return startTime; + } + + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + @Column(name="DEVELOP_DEPT") + public String getDevelopDept() { + return developDept; + } + + public void setDevelopDept(String developDept) { + this.developDept = developDept; + } + + @Column(name="END_TIME") + public Date getEndTime() { + return endTime; + } + + public void setEndTime(Date endTime) { + this.endTime = endTime; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="INSPECTION_PERSON") + public String getInSpectionPerson() { + return inSpectionPerson; + } + + public void setInSpectionPerson(String inSpectionPerson) { + this.inSpectionPerson = inSpectionPerson; + } + + @Column(name="INSERT_TIME") + public Date getInsertTime() { + return insertTime; + } + + public void setInsertTime(Date insertTime) { + this.insertTime = insertTime; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="INSPECTION_END_TIME") + public String getInSpectionEndTime() { + return inSpectionEndTime; + } + + public void setInSpectionEndTime(String inSpectionEndTime) { + this.inSpectionEndTime = inSpectionEndTime; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="MILEAGE") + public int getMileage() { + return mileage; + } + + public void setMileage(int mileage) { + this.mileage = mileage; + } + + @Column(name="INSPECTION_START_TIME") + public String getInSpectionStartTime() { + return inSpectionStartTime; + } + + public void setInSpectionStartTime(String inSpectionStartTime) { + this.inSpectionStartTime = inSpectionStartTime; + } + + @Column(name="INSPECTION_GROUP") + public String getInSpectionGroup() { + return inSpectionGroup; + } + + public void setInSpectionGroup(String inSpectionGroup) { + this.inSpectionGroup = inSpectionGroup; + } + + @Column(name="END_DATE") + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java new file mode 100644 index 0000000..023e5c4 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionPlanConfig.java @@ -0,0 +1,115 @@ +package com.casic.PgInterface.maintenance.domain; + + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_PLAN_CONFIG") +public class PgAssetInSpectionPlanConfig implements Serializable { + + private String keyId;//唯一键值 + private String planId;//巡检计划keyID + private String configId;//巡检配置keyId + private String configText;//配置文件内容 + private Date createDate;//创建时间 + private String configModular;//配置模块 + private String creator;//创建人 + private String configNote;//巡检内容说明 + private String stockCategory;//巡检设备二级分类 + private String configClassifiation;//巡检类别 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CONFIG_ID") + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + @Column(name="CONFIG_TEXT") + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="CONFIG_MODULAR") + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="CONFIG_NOTE") + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } + + @Column(name="STOCK_CATEGORY") + public String getStockCategory() { + return stockCategory; + } + + public void setStockCategory(String stockCategory) { + this.stockCategory = stockCategory; + } + + @Column(name="CONFIG_CLASSIFICATION") + public String getConfigClassifiation() { + return configClassifiation; + } + + public void setConfigClassifiation(String configClassifiation) { + this.configClassifiation = configClassifiation; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java new file mode 100644 index 0000000..b1043b0 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java @@ -0,0 +1,173 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_RECORD") +public class PgAssetInSpectionRecord implements Serializable { + + private String keyId;//null; + private String planId;//巡检计划keyId + private Date createDate;//创建日期 + private int state;//巡检记录状态 + private String creator;//创建人 + private String patrolMan;//巡检人 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private Date operateDate;//计划巡检日期 + private String remark;//巡检记录 + private String buildCabin;//舱室 + private String inSpectionPrace;//巡检地点 + private String otherPatrolMan;//其他巡检人 + private String recordNo;//记录单号 + private String project;//所属项目 + private String planName;//计划名称 + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="PLAN_ID") + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + @Column(name="CREATE_DATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="STATE") + public int getState() { + return state; + } + + public void setState(int state) { + this.state = state; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="PATROL_MAN") + public String getPatrolMan() { + return patrolMan; + } + + public void setPatrolMan(String patrolMan) { + this.patrolMan = patrolMan; + } + + @Column(name="START_PILE_NO") + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + @Column(name="END_PILE_NO") + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + @Column(name="OPERATE_DATE") + public Date getOperateDate() { + return operateDate; + } + + public void setOperateDate(Date operateDate) { + this.operateDate = operateDate; + } + + @Column(name="REMARK") + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + @Column(name="BUILD_CABIN") + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + @Column(name="INSPECTION_PRACE") + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + @Column(name="OTHER_PATROL_MAN") + public String getOtherPatrolMan() { + return otherPatrolMan; + } + + public void setOtherPatrolMan(String otherPatrolMan) { + this.otherPatrolMan = otherPatrolMan; + } + + @Column(name="RECORD_NO") + public String getRecordNo() { + return recordNo; + } + + public void setRecordNo(String recordNo) { + this.recordNo = recordNo; + } + + @Column(name="PROJECT") + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + @Column(name="PLAN_NAME") + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java new file mode 100644 index 0000000..51e1f9a --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecordDetail.java @@ -0,0 +1,183 @@ +package com.casic.PgInterface.maintenance.domain; + +import javax.persistence.*; +import java.io.Serializable; +import java.util.Date; + +@Entity +@Table(name = "PG_ASSET_INSPECTION_RECORD_DETAIL") +public class PgAssetInSpectionRecordDetail implements Serializable { + + private String keyId;//null + private String stockKeyId;//设备编号 + private String inspector;//巡检人 + private Date inspectTime;//巡检时间 + private String inspectResult;//巡检情况 + private String inspectAddress;//巡检地点 + private String harm;//发现问题 + private String resolvent;//解决办法 + private String faultApplyId;//故障单keyId + private String configSort;//配置分类 + private String recordId;//巡检记录单id号 + private String configText;//巡检配置项文本 + private Date createDate;//null + private String configId;//巡检配置项id; + private String configModular;//巡检记录单模块 + private String creator;//null + private String configNote;//记录单配置说明 + + + @Id + @GeneratedValue(strategy= GenerationType.AUTO) + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + @Column(name="STOCK_KEY_ID") + public String getStockKeyId() { + return stockKeyId; + } + + public void setStockKeyId(String stockKeyId) { + this.stockKeyId = stockKeyId; + } + + @Column(name="INSPECTOR") + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + @Column(name="INSPECT_TIME") + public Date getInspectTime() { + return inspectTime; + } + + public void setInspectTime(Date inspectTime) { + this.inspectTime = inspectTime; + } + + @Column(name="INSPECT_RESULT") + public String getInspectResult() { + return inspectResult; + } + + public void setInspectResult(String inspectResult) { + this.inspectResult = inspectResult; + } + + @Column(name="INSPECT_ADDRESS") + public String getInspectAddress() { + return inspectAddress; + } + + public void setInspectAddress(String inspectAddress) { + this.inspectAddress = inspectAddress; + } + + @Column(name="HARM") + public String getHarm() { + return harm; + } + + public void setHarm(String harm) { + this.harm = harm; + } + + @Column(name="RESOLVENT") + public String getResolvent() { + return resolvent; + } + + public void setResolvent(String resolvent) { + this.resolvent = resolvent; + } + + @Column(name="FAULT_APPLY_ID") + public String getFaultApplyId() { + return faultApplyId; + } + + public void setFaultApplyId(String faultApplyId) { + this.faultApplyId = faultApplyId; + } + + @Column(name="CONFIG_SORT") + public String getConfigSort() { + return configSort; + } + + public void setConfigSort(String configSort) { + this.configSort = configSort; + } + + @Column(name="RECORD_ID") + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + @Column(name="CONFIG_TEXT") + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + @Column(name="CREATEDATE") + public Date getCreateDate() { + return createDate; + } + + public void setCreateDate(Date createDate) { + this.createDate = createDate; + } + + @Column(name="CONFIG_ID") + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + @Column(name="CONFIG_MODULAR") + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + @Column(name="CREATOR") + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + @Column(name="CONFIG_NOTE") + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java new file mode 100644 index 0000000..18a1184 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanConfigDto.java @@ -0,0 +1,96 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionPlanConfigDto { + + private String keyId;//唯一键值 + private String planId;//巡检计划keyID + private String configId;//巡检配置keyId + private String configText;//配置文件内容 + private String createDate;//创建时间 + private String configModular;//配置模块 + private String creator;//创建人 + private String configNote;//巡检内容说明 + private String stockCategory;//巡检设备二级分类 + private String configClassifiation;//巡检类别 + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } + + public String getStockCategory() { + return stockCategory; + } + + public void setStockCategory(String stockCategory) { + this.stockCategory = stockCategory; + } + + public String getConfigClassifiation() { + return configClassifiation; + } + + public void setConfigClassifiation(String configClassifiation) { + this.configClassifiation = configClassifiation; + } + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java new file mode 100644 index 0000000..cb4b6f9 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionPlanDto.java @@ -0,0 +1,277 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionPlanDto { + + private String keyId;//唯一键值 + private String planName;//巡检计划名称 + private String startDate;//巡检开始时间Date + private String frequency;//巡检频率 + private String state;//状态int + private String responsibleDept;//负责单位/部门/小组 + private String planNo;//巡检计划编号 + private String inspectionType;//巡检类型 + private String inspectionMode;//巡检方式 + private String inspectionRoute;//巡检路线 + private String frequencyDate;//巡检具体日期 + private String frequencyTime;//巡检具体时间 + private String froJect;//项目 + private String comLile;//编制人 + private String startTime;//编制时间Date + private String developDept;//定制部门 + private String endTime;//结束时间Date + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String inSpectionPerson;//巡检人 + private String insertTime;//插入时间Date + private String createDate;//创建时间Date + private String inSpectionEndTime;//巡检结束时间 + private String inSpectionPrace;//巡检地点 + private String creator;//创建人 + private String buildCabin;//巡检舱室 + private String mileage;//int + private String inSpectionStartTime;//巡检开始时间 + private String inSpectionGroup;//巡检部门 + private String endDate;//Date + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getFrequency() { + return frequency; + } + + public void setFrequency(String frequency) { + this.frequency = frequency; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getResponsibleDept() { + return responsibleDept; + } + + public void setResponsibleDept(String responsibleDept) { + this.responsibleDept = responsibleDept; + } + + public String getPlanNo() { + return planNo; + } + + public void setPlanNo(String planNo) { + this.planNo = planNo; + } + + public String getInspectionType() { + return inspectionType; + } + + public void setInspectionType(String inspectionType) { + this.inspectionType = inspectionType; + } + + public String getInspectionMode() { + return inspectionMode; + } + + public void setInspectionMode(String inspectionMode) { + this.inspectionMode = inspectionMode; + } + + public String getInspectionRoute() { + return inspectionRoute; + } + + public void setInspectionRoute(String inspectionRoute) { + this.inspectionRoute = inspectionRoute; + } + + public String getFrequencyDate() { + return frequencyDate; + } + + public void setFrequencyDate(String frequencyDate) { + this.frequencyDate = frequencyDate; + } + + public String getFrequencyTime() { + return frequencyTime; + } + + public void setFrequencyTime(String frequencyTime) { + this.frequencyTime = frequencyTime; + } + + public String getFroJect() { + return froJect; + } + + public void setFroJect(String froJect) { + this.froJect = froJect; + } + + public String getComLile() { + return comLile; + } + + public void setComLile(String comLile) { + this.comLile = comLile; + } + + public String getStartTime() { + return startTime; + } + + public void setStartTime(String startTime) { + this.startTime = startTime; + } + + public String getDevelopDept() { + return developDept; + } + + public void setDevelopDept(String developDept) { + this.developDept = developDept; + } + + public String getEndTime() { + return endTime; + } + + public void setEndTime(String endTime) { + this.endTime = endTime; + } + + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + public String getInSpectionPerson() { + return inSpectionPerson; + } + + public void setInSpectionPerson(String inSpectionPerson) { + this.inSpectionPerson = inSpectionPerson; + } + + public String getInsertTime() { + return insertTime; + } + + public void setInsertTime(String insertTime) { + this.insertTime = insertTime; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getInSpectionEndTime() { + return inSpectionEndTime; + } + + public void setInSpectionEndTime(String inSpectionEndTime) { + this.inSpectionEndTime = inSpectionEndTime; + } + + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + public String getMileage() { + return mileage; + } + + public void setMileage(String mileage) { + this.mileage = mileage; + } + + public String getInSpectionStartTime() { + return inSpectionStartTime; + } + + public void setInSpectionStartTime(String inSpectionStartTime) { + this.inSpectionStartTime = inSpectionStartTime; + } + + public String getInSpectionGroup() { + return inSpectionGroup; + } + + public void setInSpectionGroup(String inSpectionGroup) { + this.inSpectionGroup = inSpectionGroup; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java new file mode 100644 index 0000000..a1d961e --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDetailDto.java @@ -0,0 +1,163 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionRecordDetailDto { + + private String keyId;//null + private String stockKeyId;//设备编号 + private String inspector;//巡检人 + private String inspectTime;//巡检时间 + private String inspectResult;//巡检情况 + private String inspectAddress;//巡检地点 + private String harm;//发现问题 + private String resolvent;//解决办法 + private String faultApplyId;//故障单keyId + private String configSort;//配置分类 + private String recordId;//巡检记录单id号 + private String configText;//巡检配置项文本 + private String createDate;//null + private String configId;//巡检配置项id; + private String configModular;//巡检记录单模块 + private String creator;//null + private String configNote;//记录单配置说明 + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getStockKeyId() { + return stockKeyId; + } + + public void setStockKeyId(String stockKeyId) { + this.stockKeyId = stockKeyId; + } + + + public String getInspector() { + return inspector; + } + + public void setInspector(String inspector) { + this.inspector = inspector; + } + + public String getInspectTime() { + return inspectTime; + } + + public void setInspectTime(String inspectTime) { + this.inspectTime = inspectTime; + } + + + public String getInspectResult() { + return inspectResult; + } + + public void setInspectResult(String inspectResult) { + this.inspectResult = inspectResult; + } + + public String getInspectAddress() { + return inspectAddress; + } + + public void setInspectAddress(String inspectAddress) { + this.inspectAddress = inspectAddress; + } + + public String getHarm() { + return harm; + } + + public void setHarm(String harm) { + this.harm = harm; + } + + public String getResolvent() { + return resolvent; + } + + public void setResolvent(String resolvent) { + this.resolvent = resolvent; + } + + + public String getFaultApplyId() { + return faultApplyId; + } + + public void setFaultApplyId(String faultApplyId) { + this.faultApplyId = faultApplyId; + } + + public String getConfigSort() { + return configSort; + } + + public void setConfigSort(String configSort) { + this.configSort = configSort; + } + + + public String getRecordId() { + return recordId; + } + + public void setRecordId(String recordId) { + this.recordId = recordId; + } + + public String getConfigText() { + return configText; + } + + public void setConfigText(String configText) { + this.configText = configText; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getConfigId() { + return configId; + } + + public void setConfigId(String configId) { + this.configId = configId; + } + + public String getConfigModular() { + return configModular; + } + + public void setConfigModular(String configModular) { + this.configModular = configModular; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getConfigNote() { + return configNote; + } + + public void setConfigNote(String configNote) { + this.configNote = configNote; + } +} + diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java new file mode 100644 index 0000000..72bfeed --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java @@ -0,0 +1,148 @@ +package com.casic.PgInterface.maintenance.dto; + +public class PgAssetInSpectionRecordDto { + private String keyId;//null; + private String planId;//巡检计划keyId + private String createDate;//创建日期 + private String state;//巡检记录状态 + private String creator;//创建人 + private String patrolMan;//巡检人 + private String startPileNo;//开始桩号 + private String endPileNo;//结束桩号 + private String operateDate;//计划巡检日期 + private String remark;//巡检记录 + private String buildCabin;//舱室 + private String inSpectionPrace;//巡检地点 + private String otherPatrolMan;//其他巡检人 + private String recordNo;//记录单号 + private String project;//所属项目 + private String planName;//计划名称 + + public String getKeyId() { + return keyId; + } + + public void setKeyId(String keyId) { + this.keyId = keyId; + } + + public String getPlanId() { + return planId; + } + + public void setPlanId(String planId) { + this.planId = planId; + } + + public String getCreateDate() { + return createDate; + } + + public void setCreateDate(String createDate) { + this.createDate = createDate; + } + + public String getState() { + return state; + } + + public void setState(String state) { + this.state = state; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public String getPatrolMan() { + return patrolMan; + } + + public void setPatrolMan(String patrolMan) { + this.patrolMan = patrolMan; + } + + public String getStartPileNo() { + return startPileNo; + } + + public void setStartPileNo(String startPileNo) { + this.startPileNo = startPileNo; + } + + public String getEndPileNo() { + return endPileNo; + } + + public void setEndPileNo(String endPileNo) { + this.endPileNo = endPileNo; + } + + public String getOperateDate() { + return operateDate; + } + + public void setOperateDate(String operateDate) { + this.operateDate = operateDate; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getBuildCabin() { + return buildCabin; + } + + public void setBuildCabin(String buildCabin) { + this.buildCabin = buildCabin; + } + + public String getInSpectionPrace() { + return inSpectionPrace; + } + + public void setInSpectionPrace(String inSpectionPrace) { + this.inSpectionPrace = inSpectionPrace; + } + + public String getOtherPatrolMan() { + return otherPatrolMan; + } + + public void setOtherPatrolMan(String otherPatrolMan) { + this.otherPatrolMan = otherPatrolMan; + } + + public String getRecordNo() { + return recordNo; + } + + public void setRecordNo(String recordNo) { + this.recordNo = recordNo; + } + + public String getProject() { + return project; + } + + public void setProject(String project) { + this.project = project; + } + + public String getPlanName() { + return planName; + } + + public void setPlanName(String planName) { + this.planName = planName; + } +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionPlanConfigManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionPlanConfigManager.java new file mode 100644 index 0000000..7d2c502 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionPlanConfigManager.java @@ -0,0 +1,6 @@ +package com.casic.PgInterface.maintenance.manager; + +public class PgAssetInSpectionPlanConfigManager { + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionPlanManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionPlanManager.java new file mode 100644 index 0000000..5ca9d25 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionPlanManager.java @@ -0,0 +1,7 @@ +package com.casic.PgInterface.maintenance.manager; + +public class PgAssetInSpectionPlanManager { + + + +} diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordDetailManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordDetailManager.java new file mode 100644 index 0000000..8531cc5 --- /dev/null +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordDetailManager.java @@ -0,0 +1,4 @@ +package com.casic.PgInterface.maintenance.manager; + +public class PgAssetInSpectionRecordDetailManager { +} diff --git a/.idea/workspace.xml b/.idea/workspace.xml index c71da56..5d45577 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,19 +6,20 @@ - + + + + + + + + + + + + + - - - - - - - - - - - @@ -61,7 +62,7 @@ - + @@ -73,8 +74,8 @@ - - + + @@ -83,10 +84,10 @@ - + - - + + @@ -94,7 +95,7 @@ - + @@ -111,10 +112,111 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -173,16 +275,6 @@ @@ -263,10 +365,9 @@ - @@ -332,7 +433,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +