diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ @POST
+ @Path("getPgAssetPlanStaticList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+ @FormParam("endTime") String endTime,
+ @FormParam("staticType") String staticType) throws Exception{
+ Map resultMap=new HashMap<>();
+ String msg="";
+ String result="";
+
+ List pgAssetPlanStaticList = null;
+ try{
+ pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+ if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+ msg="巡检统计信息获取成功";
+ else
+ msg="统计信息获取失败";
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ msg="统计失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanStaticList);
+
+ return resultMap;
+ }
+
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ @POST
+ @Path("getPgAssetPlanStaticList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+ @FormParam("endTime") String endTime,
+ @FormParam("staticType") String staticType) throws Exception{
+ Map resultMap=new HashMap<>();
+ String msg="";
+ String result="";
+
+ List pgAssetPlanStaticList = null;
+ try{
+ pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+ if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+ msg="巡检统计信息获取成功";
+ else
+ msg="统计信息获取失败";
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ msg="统计失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanStaticList);
+
+ return resultMap;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- /**
- * 获取巡检记录
- */
- @POST
- @Path("getPgAssetRecordList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
- @FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime){
- Map resultMap=new HashMap<>();
- String msg="";
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- try{
- pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
- if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
- msg="巡检信息获取成功";
- else
- msg="不存在巡检信息";
- }
- catch(Exception ex){
- ex.printStackTrace();
- msg="巡检信息获取失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
- return resultMap;
- }
-
-}
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ @POST
+ @Path("getPgAssetPlanStaticList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+ @FormParam("endTime") String endTime,
+ @FormParam("staticType") String staticType) throws Exception{
+ Map resultMap=new HashMap<>();
+ String msg="";
+ String result="";
+
+ List pgAssetPlanStaticList = null;
+ try{
+ pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+ if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+ msg="巡检统计信息获取成功";
+ else
+ msg="统计信息获取失败";
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ msg="统计失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanStaticList);
+
+ return resultMap;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- /**
- * 获取巡检记录
- */
- @POST
- @Path("getPgAssetRecordList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
- @FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime){
- Map resultMap=new HashMap<>();
- String msg="";
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- try{
- pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
- if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
- msg="巡检信息获取成功";
- else
- msg="不存在巡检信息";
- }
- catch(Exception ex){
- ex.printStackTrace();
- msg="巡检信息获取失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
- return resultMap;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- @POST
- @Path("getPgAssetRecordHeadStaticList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime,
- @FormParam("staticType") String staticType) throws Exception{
- Map resultMap=new HashMap<>();
- String msg="";
- String result="";
-
- List pgAssetInSpectionRecordStaticList = null;
- try{
- pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
- if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
- msg="巡检统计信息获取成功";
- else
- msg="统计信息获取失败";
- }
- catch (Exception ex){
- ex.printStackTrace();
- msg="统计失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
- return resultMap;
- }
-
-
-}
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ @POST
+ @Path("getPgAssetPlanStaticList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+ @FormParam("endTime") String endTime,
+ @FormParam("staticType") String staticType) throws Exception{
+ Map resultMap=new HashMap<>();
+ String msg="";
+ String result="";
+
+ List pgAssetPlanStaticList = null;
+ try{
+ pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+ if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+ msg="巡检统计信息获取成功";
+ else
+ msg="统计信息获取失败";
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ msg="统计失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanStaticList);
+
+ return resultMap;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- /**
- * 获取巡检记录
- */
- @POST
- @Path("getPgAssetRecordList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
- @FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime){
- Map resultMap=new HashMap<>();
- String msg="";
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- try{
- pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
- if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
- msg="巡检信息获取成功";
- else
- msg="不存在巡检信息";
- }
- catch(Exception ex){
- ex.printStackTrace();
- msg="巡检信息获取失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
- return resultMap;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- @POST
- @Path("getPgAssetRecordHeadStaticList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime,
- @FormParam("staticType") String staticType) throws Exception{
- Map resultMap=new HashMap<>();
- String msg="";
- String result="";
-
- List pgAssetInSpectionRecordStaticList = null;
- try{
- pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
- if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
- msg="巡检统计信息获取成功";
- else
- msg="统计信息获取失败";
- }
- catch (Exception ex){
- ex.printStackTrace();
- msg="统计失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
- return resultMap;
- }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
if(pgDeviceDtoList==null)
msg="信息获取失败";
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ @POST
+ @Path("getPgAssetPlanStaticList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+ @FormParam("endTime") String endTime,
+ @FormParam("staticType") String staticType) throws Exception{
+ Map resultMap=new HashMap<>();
+ String msg="";
+ String result="";
+
+ List pgAssetPlanStaticList = null;
+ try{
+ pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+ if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+ msg="巡检统计信息获取成功";
+ else
+ msg="统计信息获取失败";
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ msg="统计失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanStaticList);
+
+ return resultMap;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- /**
- * 获取巡检记录
- */
- @POST
- @Path("getPgAssetRecordList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
- @FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime){
- Map resultMap=new HashMap<>();
- String msg="";
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- try{
- pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
- if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
- msg="巡检信息获取成功";
- else
- msg="不存在巡检信息";
- }
- catch(Exception ex){
- ex.printStackTrace();
- msg="巡检信息获取失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
- return resultMap;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- @POST
- @Path("getPgAssetRecordHeadStaticList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime,
- @FormParam("staticType") String staticType) throws Exception{
- Map resultMap=new HashMap<>();
- String msg="";
- String result="";
-
- List pgAssetInSpectionRecordStaticList = null;
- try{
- pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
- if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
- msg="巡检统计信息获取成功";
- else
- msg="统计信息获取失败";
- }
- catch (Exception ex){
- ex.printStackTrace();
- msg="统计失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
- return resultMap;
- }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
if(pgDeviceDtoList==null)
msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 43e3244..96be38c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -286,7 +286,7 @@
try {
if (apCode != "") {
String apCodeStr=apCode.substring(0,3);
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
if(pgDeviceDtoList==null)
msg="不存在关联摄像机";
else
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ @POST
+ @Path("getPgAssetPlanStaticList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+ @FormParam("endTime") String endTime,
+ @FormParam("staticType") String staticType) throws Exception{
+ Map resultMap=new HashMap<>();
+ String msg="";
+ String result="";
+
+ List pgAssetPlanStaticList = null;
+ try{
+ pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+ if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+ msg="巡检统计信息获取成功";
+ else
+ msg="统计信息获取失败";
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ msg="统计失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanStaticList);
+
+ return resultMap;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- /**
- * 获取巡检记录
- */
- @POST
- @Path("getPgAssetRecordList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
- @FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime){
- Map resultMap=new HashMap<>();
- String msg="";
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- try{
- pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
- if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
- msg="巡检信息获取成功";
- else
- msg="不存在巡检信息";
- }
- catch(Exception ex){
- ex.printStackTrace();
- msg="巡检信息获取失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
- return resultMap;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- @POST
- @Path("getPgAssetRecordHeadStaticList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime,
- @FormParam("staticType") String staticType) throws Exception{
- Map resultMap=new HashMap<>();
- String msg="";
- String result="";
-
- List pgAssetInSpectionRecordStaticList = null;
- try{
- pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
- if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
- msg="巡检统计信息获取成功";
- else
- msg="统计信息获取失败";
- }
- catch (Exception ex){
- ex.printStackTrace();
- msg="统计失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
- return resultMap;
- }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
if(pgDeviceDtoList==null)
msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 43e3244..96be38c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -286,7 +286,7 @@
try {
if (apCode != "") {
String apCodeStr=apCode.substring(0,3);
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
if(pgDeviceDtoList==null)
msg="不存在关联摄像机";
else
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ @POST
+ @Path("getPgAssetPlanStaticList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+ @FormParam("endTime") String endTime,
+ @FormParam("staticType") String staticType) throws Exception{
+ Map resultMap=new HashMap<>();
+ String msg="";
+ String result="";
+
+ List pgAssetPlanStaticList = null;
+ try{
+ pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+ if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+ msg="巡检统计信息获取成功";
+ else
+ msg="统计信息获取失败";
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ msg="统计失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanStaticList);
+
+ return resultMap;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- /**
- * 获取巡检记录
- */
- @POST
- @Path("getPgAssetRecordList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
- @FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime){
- Map resultMap=new HashMap<>();
- String msg="";
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- try{
- pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
- if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
- msg="巡检信息获取成功";
- else
- msg="不存在巡检信息";
- }
- catch(Exception ex){
- ex.printStackTrace();
- msg="巡检信息获取失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
- return resultMap;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- @POST
- @Path("getPgAssetRecordHeadStaticList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime,
- @FormParam("staticType") String staticType) throws Exception{
- Map resultMap=new HashMap<>();
- String msg="";
- String result="";
-
- List pgAssetInSpectionRecordStaticList = null;
- try{
- pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
- if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
- msg="巡检统计信息获取成功";
- else
- msg="统计信息获取失败";
- }
- catch (Exception ex){
- ex.printStackTrace();
- msg="统计失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
- return resultMap;
- }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
if(pgDeviceDtoList==null)
msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 43e3244..96be38c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -286,7 +286,7 @@
try {
if (apCode != "") {
String apCodeStr=apCode.substring(0,3);
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
if(pgDeviceDtoList==null)
msg="不存在关联摄像机";
else
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..575ddd4
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ @POST
+ @Path("getPgAssetPlanStaticList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+ @FormParam("endTime") String endTime,
+ @FormParam("staticType") String staticType) throws Exception{
+ Map resultMap=new HashMap<>();
+ String msg="";
+ String result="";
+
+ List pgAssetPlanStaticList = null;
+ try{
+ pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+ if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+ msg="巡检统计信息获取成功";
+ else
+ msg="统计信息获取失败";
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ msg="统计失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanStaticList);
+
+ return resultMap;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- /**
- * 获取巡检记录
- */
- @POST
- @Path("getPgAssetRecordList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
- @FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime){
- Map resultMap=new HashMap<>();
- String msg="";
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- try{
- pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
- if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
- msg="巡检信息获取成功";
- else
- msg="不存在巡检信息";
- }
- catch(Exception ex){
- ex.printStackTrace();
- msg="巡检信息获取失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
- return resultMap;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- @POST
- @Path("getPgAssetRecordHeadStaticList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime,
- @FormParam("staticType") String staticType) throws Exception{
- Map resultMap=new HashMap<>();
- String msg="";
- String result="";
-
- List pgAssetInSpectionRecordStaticList = null;
- try{
- pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
- if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
- msg="巡检统计信息获取成功";
- else
- msg="统计信息获取失败";
- }
- catch (Exception ex){
- ex.printStackTrace();
- msg="统计失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
- return resultMap;
- }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
if(pgDeviceDtoList==null)
msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 43e3244..96be38c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -286,7 +286,7 @@
try {
if (apCode != "") {
String apCodeStr=apCode.substring(0,3);
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
if(pgDeviceDtoList==null)
msg="不存在关联摄像机";
else
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..575ddd4
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190828.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190828.docx"
deleted file mode 100644
index 264ce46..0000000
--- "a/\346\216\245\345\217\243\350\257\264\346\230\21620190828.docx"
+++ /dev/null
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 616405e..fd7389f 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,15 +7,27 @@
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
@@ -30,43 +42,47 @@
-
-
+
+
-
-
+
+
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
-
-
+
+
+
@@ -77,22 +93,24 @@
+
-
+
+
-
+
-
+
-
+
-
-
+
+
@@ -101,70 +119,40 @@
-
+
-
-
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -191,6 +179,7 @@
getPgDeviceByDevType
message
getConstructionByType
+ getPgCameraListByPosition
@@ -199,23 +188,11 @@
@@ -285,16 +274,18 @@
-
-
-
-
+
+
+
+
+
+
@@ -380,8 +371,6 @@
-
-
@@ -420,6 +409,7 @@
+
@@ -524,6 +514,16 @@
+
+
+
+
+
+
+
+
+
+
1564361618083
@@ -588,11 +588,18 @@
1566972146710
-
+
+ 1567126525554
+
+
+
+ 1567126525554
+
+
-
+
@@ -604,9 +611,9 @@
-
+
-
+
@@ -614,10 +621,11 @@
+
-
+
@@ -642,7 +650,7 @@
-
+
@@ -650,22 +658,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -681,6 +690,16 @@
+
+
+
@@ -693,7 +712,8 @@
-
+
+
@@ -708,160 +728,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -911,13 +777,6 @@
-
-
-
-
-
-
-
@@ -953,20 +812,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -988,20 +833,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,37 +840,17 @@
-
+
-
-
-
-
-
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -1050,30 +861,386 @@
-
+
-
-
-
-
-
-
-
-
+
+
-
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
index 43a8e7a..3c5ca0c 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -1,6 +1,7 @@
package com.casic.PgInterface.devTable.manager;
import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
+import com.casic.PgInterface.core.util.StringUtils;
import com.casic.PgInterface.devTable.domain.PgDevice;
import com.casic.PgInterface.devTable.dto.PgDeviceDto;
import com.casic.PgInterface.devTable.dto.PgDeviceTypeStatisticDto;
@@ -130,10 +131,13 @@
}
//根据设备位置(仓位)获取摄像机列表
- public List getPgCameraListByPosition(String position){
+ public List getPgCameraListByPosition(String partition,String position){
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.like("position",position+"%"));
-// criteria.add(Restrictions.eq("devType","球机"));
+ if(StringUtils.isNotBlank(partition))
+ criteria.add(Restrictions.eq("partition",partition));
+ if(StringUtils.isNotBlank(position))
+ criteria.add(Restrictions.like("position",position+"%"));
+
criteria.add(Restrictions.or(Restrictions.eq("devType","球机"),Restrictions.eq("devType","枪机")));
List pgDeviceList=criteria.list();
@@ -165,7 +169,7 @@
dto.setDevCode(objects[5].toString());
dto.setDevType(objects[6].toString());
if(objects[7]!=null)
- dto.setIp(objects[7].toString());
+ dto.setIp(objects[7].toString());
dto.setIsOpen(objects[8].toString());
dto.setPartition(objects[11].toString());
dto.setPipeGallery(objects[12].toString());
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
deleted file mode 100644
index 0515a31..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetInSpectionRecord.java
+++ /dev/null
@@ -1,213 +0,0 @@
-package com.casic.PgInterface.maintenance.domain;
-
-import javax.persistence.*;
-import java.io.Serializable;
-
-@Entity
-@Table(name = "PG_ASSET_INSPECTION_RECORD")
-@SequenceGenerator(name = "SEQ_PG_ASSET_RECORD_ID", sequenceName = "SEQ_PG_ASSET_RECORD_ID", allocationSize = 1, initialValue = 1)
-public class PgAssetInSpectionRecord implements Serializable {
-
- private static final long serialVersionUID = 1L;
- private Long id;
- private String keyId;//巡检记录单id
- private String planId;//巡检计划ID
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- @Id
- @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_RECORD_ID")
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- @Column(name="KEY_ID")
- 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 String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- @Column(name="STATE")
- public String getState() {
- return state;
- }
-
- public void setState(String state) {
- this.state = state;
- }
-
- @Column(name="CREATOR")
- public String getCreator() {
- return creator;
- }
-
- public void setCreator(String creator) {
- this.creator = creator;
- }
-
- @Column(name="PLAN_NAME")
- public String getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- @Column(name="RECORD_NO")
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- @Column(name="PLAN_NO")
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- @Column(name="RESPONSIBIE_DEPT")
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- @Column(name="INSPECTION_PERSON")
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- @Column(name="PATROL_MAN")
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- @Column(name="OPERATE_DATE")
- public String getOperateDate() {
- return operateDate;
- }
-
- public void setOperateDate(String 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="PROJECT")
- public String getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- @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_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;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
new file mode 100644
index 0000000..65eb5d2
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgAssetPlan.java
@@ -0,0 +1,364 @@
+package com.casic.PgInterface.maintenance.domain;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Entity
+@Table(name = "PG_ASSET_INSPECTION_PLAN")
+@SequenceGenerator(name = "SEQ_PG_ASSET_PLAN_ID", sequenceName = "SEQ_PG_ASSET_PLAN_ID", allocationSize = 1, initialValue = 1)
+public class PgAssetPlan implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ private Long id;
+ private String KEY_ID;//唯一键值
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_PERSON;//巡检人
+ private String START_DATE;//巡检开始时间
+ private String END_DATE;
+ private String FREQUENCY;//巡检频率
+ private String STATE;//状态
+ private String RESPONSIBLE_DEPT;//负责单位/部门/小组
+ private String PLAN_NO;//巡检计划编号
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_MODE;//巡检方式
+ private String INSPECTION_ROUTE;//巡检路线
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String INSPECTION_GROUP;//巡检部门
+ private String INSERT_TIME;//插入时间
+ private String FREQUENCYDATE;//巡检具体日期
+ private String FREQUENCYTIME;//巡检具体时间
+ private String CREATEDATE;//创建时间
+ private String CREATOR;//创建人
+ private String PROJECT;//项目
+ private String COMLILE;//编制人
+ private String START_TIME;//编制时间
+ private String DEVELOP_DEPT;//制定部门
+ private String END_TIME;//结束时间
+ private String START_PILE_NO;//开始桩号
+ private String END_PILE_NO;//结束桩号
+ private String BUILD_CABIN;//巡检舱室
+ private String MILEAGE;
+ private String FREQUENCY_TIME;//巡检具体时间
+ private String FREQUENCYTIME_END;
+ private String KETTLE_TS;
+ private String UPDATEDATE;
+
+ @Id
+ @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_PG_ASSET_PLAN_ID")
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ @Column(name="KEY_ID")
+ public String getKEY_ID() {
+ return KEY_ID;
+ }
+
+ public void setKEY_ID(String KEY_ID) {
+ this.KEY_ID = KEY_ID;
+ }
+
+ @Column(name="PLAN_NAME")
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ @Column(name="INSPECTION_PERSON")
+ public String getINSPECTION_PERSON() {
+ return INSPECTION_PERSON;
+ }
+
+ public void setINSPECTION_PERSON(String INSPECTION_PERSON) {
+ this.INSPECTION_PERSON = INSPECTION_PERSON;
+ }
+
+ @Column(name="START_DATE")
+ public String getSTART_DATE() {
+ return START_DATE;
+ }
+
+ public void setSTART_DATE(String START_DATE) {
+ this.START_DATE = START_DATE;
+ }
+
+ @Column(name="END_DATE")
+ public String getEND_DATE() {
+ return END_DATE;
+ }
+
+ public void setEND_DATE(String END_DATE) {
+ this.END_DATE = END_DATE;
+ }
+
+ @Column(name="FREQUENCY")
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ @Column(name="STATE")
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ @Column(name="RESPONSIBLE_DEPT")
+ public String getRESPONSIBLE_DEPT() {
+ return RESPONSIBLE_DEPT;
+ }
+
+ public void setRESPONSIBLE_DEPT(String RESPONSIBLE_DEPT) {
+ this.RESPONSIBLE_DEPT = RESPONSIBLE_DEPT;
+ }
+
+ @Column(name="PLAN_NO")
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ @Column(name="INSPECTION_TYPE")
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ @Column(name="INSPECTION_MODE")
+ public String getINSPECTION_MODE() {
+ return INSPECTION_MODE;
+ }
+
+ public void setINSPECTION_MODE(String INSPECTION_MODE) {
+ this.INSPECTION_MODE = INSPECTION_MODE;
+ }
+
+ @Column(name="INSPECTION_ROUTE")
+ public String getINSPECTION_ROUTE() {
+ return INSPECTION_ROUTE;
+ }
+
+ public void setINSPECTION_ROUTE(String INSPECTION_ROUTE) {
+ this.INSPECTION_ROUTE = INSPECTION_ROUTE;
+ }
+
+ @Column(name="INSPECTION_START_TIME")
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ @Column(name="INSPECTION_END_TIME")
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ @Column(name="INSPECTION_PRACE")
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ @Column(name="INSPECTION_GROUP")
+ public String getINSPECTION_GROUP() {
+ return INSPECTION_GROUP;
+ }
+
+ public void setINSPECTION_GROUP(String INSPECTION_GROUP) {
+ this.INSPECTION_GROUP = INSPECTION_GROUP;
+ }
+
+ @Column(name="INSERT_TIME")
+ public String getINSERT_TIME() {
+ return INSERT_TIME;
+ }
+
+ public void setINSERT_TIME(String INSERT_TIME) {
+ this.INSERT_TIME = INSERT_TIME;
+ }
+
+ @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="CREATEDATE")
+ public String getCREATEDATE() {
+ return CREATEDATE;
+ }
+
+ public void setCREATEDATE(String CREATEDATE) {
+ this.CREATEDATE = CREATEDATE;
+ }
+
+ @Column(name="CREATOR")
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ @Column(name="PROJECT")
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ @Column(name="COMLILE")
+ public String getCOMLILE() {
+ return COMLILE;
+ }
+
+ public void setCOMLILE(String COMLILE) {
+ this.COMLILE = COMLILE;
+ }
+
+ @Column(name="START_TIME")
+ public String getSTART_TIME() {
+ return START_TIME;
+ }
+
+ public void setSTART_TIME(String START_TIME) {
+ this.START_TIME = START_TIME;
+ }
+
+ @Column(name="DEVELOP_DEPT")
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ @Column(name="END_TIME")
+ public String getEND_TIME() {
+ return END_TIME;
+ }
+
+ public void setEND_TIME(String END_TIME) {
+ this.END_TIME = END_TIME;
+ }
+
+ @Column(name="START_PILE_NO")
+ public String getSTART_PILE_NO() {
+ return START_PILE_NO;
+ }
+
+ public void setSTART_PILE_NO(String START_PILE_NO) {
+ this.START_PILE_NO = START_PILE_NO;
+ }
+
+ @Column(name="END_PILE_NO")
+ public String getEND_PILE_NO() {
+ return END_PILE_NO;
+ }
+
+ public void setEND_PILE_NO(String END_PILE_NO) {
+ this.END_PILE_NO = END_PILE_NO;
+ }
+
+ @Column(name="BUILD_CABIN")
+ public String getBUILD_CABIN() {
+ return BUILD_CABIN;
+ }
+
+ public void setBUILD_CABIN(String BUILD_CABIN) {
+ this.BUILD_CABIN = BUILD_CABIN;
+ }
+
+ @Column(name="MILEAGE")
+ public String getMILEAGE() {
+ return MILEAGE;
+ }
+
+ public void setMILEAGE(String MILEAGE) {
+ this.MILEAGE = MILEAGE;
+ }
+
+ @Column(name="FREQUENCY_TIME")
+ public String getFREQUENCY_TIME() {
+ return FREQUENCY_TIME;
+ }
+
+ public void setFREQUENCY_TIME(String FREQUENCY_TIME) {
+ this.FREQUENCY_TIME = FREQUENCY_TIME;
+ }
+
+ @Column(name="FREQUENCYTIME_END")
+ public String getFREQUENCYTIME_END() {
+ return FREQUENCYTIME_END;
+ }
+
+ public void setFREQUENCYTIME_END(String FREQUENCYTIME_END) {
+ this.FREQUENCYTIME_END = FREQUENCYTIME_END;
+ }
+
+ @Column(name="KETTLE_TS")
+ public String getKETTLE_TS() {
+ return KETTLE_TS;
+ }
+
+ public void setKETTLE_TS(String KETTLE_TS) {
+ this.KETTLE_TS = KETTLE_TS;
+ }
+
+ @Column(name="UPDATEDATE")
+ public String getUPDATEDATE() {
+ return UPDATEDATE;
+ }
+
+ public void setUPDATEDATE(String UPDATEDATE) {
+ this.UPDATEDATE = UPDATEDATE;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
deleted file mode 100644
index bd6e063..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordDto.java
+++ /dev/null
@@ -1,209 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class PgAssetInSpectionRecordDto {
-
- private Long id;
- private String createDate;//创建时间
- private String state;//巡检记录状态
- private String creator;//创建人
- private String planName;//计划名称
- private String recordNo;//记录单号
- private String planNo;//巡检计划编号
- private String responsibleDept;//负责单位部门小组
- private String inspectionPerson;//计划巡检人
- private String patrolMan;//巡检人
- private String operateDate;//计划巡检日期
- private String remark;//巡检记录
- private String buildCabin;//舱室
- private String project;//所属项目
- private String startPileNo;//开始桩号
- private String endPileNo;//结束桩号
- private String inspectionPrace;//巡检地点
- private String otherPatrolMan;//其他巡检人
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- 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 getPlanName() {
- return planName;
- }
-
- public void setPlanName(String planName) {
- this.planName = planName;
- }
-
- public String getRecordNo() {
- return recordNo;
- }
-
- public void setRecordNo(String recordNo) {
- this.recordNo = recordNo;
- }
-
- public String getPlanNo() {
- return planNo;
- }
-
- public void setPlanNo(String planNo) {
- this.planNo = planNo;
- }
-
- public String getResponsibleDept() {
- return responsibleDept;
- }
-
- public void setResponsibleDept(String responsibleDept) {
- this.responsibleDept = responsibleDept;
- }
-
- public String getInspectionPerson() {
- return inspectionPerson;
- }
-
- public void setInspectionPerson(String inspectionPerson) {
- this.inspectionPerson = inspectionPerson;
- }
-
- public String getPatrolMan() {
- return patrolMan;
- }
-
- public void setPatrolMan(String patrolMan) {
- this.patrolMan = patrolMan;
- }
-
- 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 getProject() {
- return project;
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- 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 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 static PgAssetInSpectionRecordDto ConvertToDto(PgAssetInSpectionRecord pgAssetInSpectionRecord){
-
- PgAssetInSpectionRecordDto pgAssetInSpectionRecordDto=new PgAssetInSpectionRecordDto();
-
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setCreateDate(pgAssetInSpectionRecord.getCreateDate());
- pgAssetInSpectionRecordDto.setState(pgAssetInSpectionRecord.getState());
- pgAssetInSpectionRecordDto.setCreator(pgAssetInSpectionRecord.getCreator());
- pgAssetInSpectionRecordDto.setPlanName(pgAssetInSpectionRecord.getPlanName());
- pgAssetInSpectionRecordDto.setRecordNo(pgAssetInSpectionRecord.getRecordNo());
- pgAssetInSpectionRecordDto.setPlanNo(pgAssetInSpectionRecord.getPlanNo());
- pgAssetInSpectionRecordDto.setResponsibleDept(pgAssetInSpectionRecord.getResponsibleDept());
- pgAssetInSpectionRecordDto.setInspectionPerson(pgAssetInSpectionRecord.getInspectionPerson());
- pgAssetInSpectionRecordDto.setPatrolMan(pgAssetInSpectionRecord.getPatrolMan());
- pgAssetInSpectionRecordDto.setOperateDate(pgAssetInSpectionRecord.getOperateDate());
- pgAssetInSpectionRecordDto.setRemark(pgAssetInSpectionRecord.getRemark());
- pgAssetInSpectionRecordDto.setBuildCabin(pgAssetInSpectionRecord.getBuildCabin());
- pgAssetInSpectionRecordDto.setProject(pgAssetInSpectionRecord.getProject());
- pgAssetInSpectionRecordDto.setStartPileNo(pgAssetInSpectionRecord.getStartPileNo());
- pgAssetInSpectionRecordDto.setEndPileNo(pgAssetInSpectionRecord.getEndPileNo());
- pgAssetInSpectionRecordDto.setInspectionPrace(pgAssetInSpectionRecord.getInspectionPrace());
- pgAssetInSpectionRecordDto.setOtherPatrolMan(pgAssetInSpectionRecord.getOtherPatrolMan());
-
- return pgAssetInSpectionRecordDto;
- }
-
-
- public static List ConvertToDtoList(List pgAssetInSpectionRecordList){
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord:pgAssetInSpectionRecordList){
- pgAssetInSpectionRecordDtoList.add(ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
deleted file mode 100644
index 81105d7..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetInSpectionRecordStatic.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.casic.PgInterface.maintenance.dto;
-
-public class PgAssetInSpectionRecordStatic {
-
- private String num;
- private String createDate;
-
- public String getNum() {
- return num;
- }
-
- public void setNum(String num) {
- this.num = num;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
-}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
new file mode 100644
index 0000000..3c6f5cc
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanDto.java
@@ -0,0 +1,150 @@
+package com.casic.PgInterface.maintenance.dto;
+
+import com.casic.PgInterface.maintenance.domain.PgAssetPlan;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PgAssetPlanDto {
+
+ private Long id;
+ private String PLAN_NO;//巡检计划编号
+ private String PLAN_NAME;//巡检计划名称
+ private String INSPECTION_TYPE;//巡检类型
+ private String INSPECTION_START_TIME;//巡检开始时间
+ private String INSPECTION_END_TIME;//巡检结束时间
+ private String INSPECTION_PRACE;//巡检地点
+ private String FREQUENCY;//巡检频率
+ private String CREATOR;//创建人
+ private String DEVELOP_DEPT;//制定部门
+ private String PROJECT;//项目
+ private String STATE;//状态
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getPLAN_NO() {
+ return PLAN_NO;
+ }
+
+ public void setPLAN_NO(String PLAN_NO) {
+ this.PLAN_NO = PLAN_NO;
+ }
+
+ public String getPLAN_NAME() {
+ return PLAN_NAME;
+ }
+
+ public void setPLAN_NAME(String PLAN_NAME) {
+ this.PLAN_NAME = PLAN_NAME;
+ }
+
+ public String getINSPECTION_TYPE() {
+ return INSPECTION_TYPE;
+ }
+
+ public void setINSPECTION_TYPE(String INSPECTION_TYPE) {
+ this.INSPECTION_TYPE = INSPECTION_TYPE;
+ }
+
+ public String getINSPECTION_START_TIME() {
+ return INSPECTION_START_TIME;
+ }
+
+ public void setINSPECTION_START_TIME(String INSPECTION_START_TIME) {
+ this.INSPECTION_START_TIME = INSPECTION_START_TIME;
+ }
+
+ public String getINSPECTION_END_TIME() {
+ return INSPECTION_END_TIME;
+ }
+
+ public void setINSPECTION_END_TIME(String INSPECTION_END_TIME) {
+ this.INSPECTION_END_TIME = INSPECTION_END_TIME;
+ }
+
+ public String getINSPECTION_PRACE() {
+ return INSPECTION_PRACE;
+ }
+
+ public void setINSPECTION_PRACE(String INSPECTION_PRACE) {
+ this.INSPECTION_PRACE = INSPECTION_PRACE;
+ }
+
+ public String getFREQUENCY() {
+ return FREQUENCY;
+ }
+
+ public void setFREQUENCY(String FREQUENCY) {
+ this.FREQUENCY = FREQUENCY;
+ }
+
+ public String getCREATOR() {
+ return CREATOR;
+ }
+
+ public void setCREATOR(String CREATOR) {
+ this.CREATOR = CREATOR;
+ }
+
+ public String getDEVELOP_DEPT() {
+ return DEVELOP_DEPT;
+ }
+
+ public void setDEVELOP_DEPT(String DEVELOP_DEPT) {
+ this.DEVELOP_DEPT = DEVELOP_DEPT;
+ }
+
+ public String getPROJECT() {
+ return PROJECT;
+ }
+
+ public void setPROJECT(String PROJECT) {
+ this.PROJECT = PROJECT;
+ }
+
+ public String getSTATE() {
+ return STATE;
+ }
+
+ public void setSTATE(String STATE) {
+ this.STATE = STATE;
+ }
+
+ public static PgAssetPlanDto ConvertToPgAssetPlanDTO(PgAssetPlan pgAssetPlan){
+
+ PgAssetPlanDto pgAssetPlanDto=new PgAssetPlanDto();
+
+ pgAssetPlanDto.setId(pgAssetPlan.getId());
+ pgAssetPlanDto.setPLAN_NO(pgAssetPlan.getPLAN_NO());
+ pgAssetPlanDto.setPLAN_NAME(pgAssetPlan.getPLAN_NAME());
+ pgAssetPlanDto.setINSPECTION_TYPE(pgAssetPlan.getINSPECTION_TYPE());
+ pgAssetPlanDto.setINSPECTION_START_TIME(pgAssetPlan.getINSPECTION_START_TIME());
+ pgAssetPlanDto.setINSPECTION_END_TIME(pgAssetPlan.getINSPECTION_END_TIME());
+ pgAssetPlanDto.setINSPECTION_PRACE(pgAssetPlan.getINSPECTION_PRACE());
+ pgAssetPlanDto.setFREQUENCY(pgAssetPlan.getFREQUENCY());
+ pgAssetPlanDto.setCREATOR(pgAssetPlan.getCREATOR());
+ pgAssetPlanDto.setDEVELOP_DEPT(pgAssetPlan.getDEVELOP_DEPT());
+ pgAssetPlanDto.setPROJECT(pgAssetPlan.getPROJECT());
+ pgAssetPlanDto.setSTATE(pgAssetPlan.getSTATE().equals("0")?"执行结束":"执行中");
+
+ return pgAssetPlanDto;
+ }
+
+ public static List ConvertToPgAssetDtoList(List pgAssetPlanList){
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+
+ for(PgAssetPlan pgAssetPlan:pgAssetPlanList){
+ pgAssetPlanDtoList.add(ConvertToPgAssetPlanDTO(pgAssetPlan));
+ }
+
+ return pgAssetPlanDtoList;
+ }
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
new file mode 100644
index 0000000..bc12db1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgAssetPlanStatic.java
@@ -0,0 +1,24 @@
+package com.casic.PgInterface.maintenance.dto;
+
+public class PgAssetPlanStatic {
+
+ private String num;
+ private String createDate;
+
+ public String getNum() {
+ return num;
+ }
+
+ public void setNum(String num) {
+ this.num = num;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
deleted file mode 100644
index c41ca7d..0000000
--- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package com.casic.PgInterface.maintenance.manager;
-
-import com.casic.PgInterface.core.hibernate.HibernateEntityDao;
-import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Service
-public class PgAssetInSpectionRecordManager extends HibernateEntityDao {
-
- public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){
- try {
- String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," +
- "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," +
- "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1";
-
- if(patrolMan!=null)
- sql+=" and PATROL_MAN like '%"+patrolMan+"%'";
- if(startTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')";
- if(endTime!=null)
- sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list();
-
- List pgAssetInSpectionRecordList=new ArrayList<>();
- for(Object[] objects1:objects){
- PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord();
-
- pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString()));
- pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1]));
- pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2]));
- pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3]));
- pgAssetInSpectionRecord.setState(String.valueOf(objects1[4]));
- pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5]));
- pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6]));
- pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7]));
- pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8]));
- pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9]));
- pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10]));
- pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11]));
- pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12]));
- pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13]));
- pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14]));
- pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15]));
- pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16]));
- pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17]));
- pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18]));
- pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19]));
-
- pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord);
- }
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList)
- {
- pgAssetInSpectionRecordDtoList.add(PgAssetInSpectionRecordDto.ConvertToDto(pgAssetInSpectionRecord));
- }
-
- return pgAssetInSpectionRecordDtoList;
- }
- catch(Exception e)
- {
- e.printStackTrace();
- return null;
- }
- }
-
- public List getPgAssetInSpectionRecordStaticLisByTime(
- String startTime, String endTime, String staticType) {
-
- String sql="";
- String dateType="";
- List pgAssetInSpectionRecordStaticList=new ArrayList<>();
- int type=Integer.valueOf(staticType);
-
- switch(type) {
- case 0://年
- dateType = "yyyy";
- break;
- case 1://月
- dateType = "yyyy-mm";
- break;
- case 2://周
- dateType = "iw";
- break;
- case 3://日
- dateType="yyyy-mm-dd";
- break;
- default:
- break;
- }
-
- sql="select count(*), to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_RECORD t where 1=1";
-
- if(startTime!=null)
- sql+=" and t.CREATE_DATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
- if(endTime!=null)
- sql+=" and t.CREATE_DATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
-
- sql+=" group by to_char(to_date(t.CREATE_DATE,'yyyy-MM-dd'), '"+dateType+"')";
-
- List objects = this.getSession().createSQLQuery(sql).list();
- for(int i=0;i {
+
+ public List getPgAssetPlanDtoList(String inSpectionPlace){
+ Criteria criteria=createCriteria(PgAssetPlan.class);
+
+ if(StringUtils.isNotBlank(inSpectionPlace))
+ criteria.add(Restrictions.like("INSPECTION_PRACE","%"+inSpectionPlace+"%"));
+ criteria.addOrder(Order.desc("id"));
+
+ List pgAssetPlanList=criteria.list();
+
+ List pgAssetPlanDtoList=PgAssetPlanDto.ConvertToPgAssetDtoList(pgAssetPlanList);
+
+ if(pgAssetPlanDtoList==null||pgAssetPlanDtoList.size()==0)
+ return null;
+ else
+ return pgAssetPlanDtoList;
+ }
+
+ public List getPgAssetPlanStaticLisByTime(
+ String startTime, String endTime, String staticType) {
+
+ String sql="";
+ String dateType="";
+ List pgAssetPlanStaticList=new ArrayList<>();
+ int type=Integer.valueOf(staticType);
+
+ switch(type) {
+ case 0://年
+ dateType = "yyyy";
+ break;
+ case 1://月
+ dateType = "yyyy-mm";
+ break;
+ case 2://周
+ dateType = "iw";
+ break;
+ case 3://日
+ dateType="yyyy-mm-dd";
+ break;
+ default:
+ break;
+ }
+
+ sql="select count(*), to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"') from PG_ASSET_INSPECTION_PLAN t where 1=1";
+
+ if(startTime!=null)
+ sql+=" and t.CREATEDATE >= to_date('"+startTime+"', 'yyyy-mm-dd')";
+ if(endTime!=null)
+ sql+=" and t.CREATEDATE <= to_date('"+endTime+"', 'yyyy-mm-dd')";
+
+ sql+=" group by to_char(to_date(t.CREATEDATE,'yyyy-MM-dd'), '"+dateType+"')";
+
+ List objects = this.getSession().createSQLQuery(sql).list();
+ for(int i=0;i pgDeviceDtoList = new ArrayList<>();
try {
- PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
- PgDevice pgDevice = pgDeviceManager.get(pgAlarm.getAlarmDevId());
- pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(pgDevice.getPosition());
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if(pgAlarm==null)
+ msg="不存在报警信息";
+ else {
+ PgDevice pgDevice = pgAlarm.getAlarmDevId();
+ if (pgDevice == null)
+ msg = "不存在报警设备";
+ else {
+ String strPosition=pgDevice.getPosition();
+ String position="";
+ if(!strPosition.equals(""))
+ position=pgDevice.getPosition().substring(0,3);
+ String partition=pgDevice.getPartition();
- msg = "关联设备获取成功";
+ pgDeviceDtoList = pgDeviceManager.getPgCameraListByPosition(partition,position);
+ msg = "关联设备获取成功";
+ }
+ }
+ }
+ else
+ msg="请输入报警设备Id信息";
} catch (Exception e) {
e.printStackTrace();
msg = "分区设备关联失败";
@@ -93,7 +122,7 @@
/*
* 根据报警记录获取关联的预案
- */
+ */
@POST
@Path("linkReservePlan")
@Produces(MediaType.APPLICATION_JSON)
@@ -103,10 +132,21 @@
List pgReservePlanDtoList=new ArrayList<>();
try{
- PgAlarm pgAlarm=pgAlarmManager.get(Long.valueOf(id));
- pgReservePlanDtoList=pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
+ if(StringUtils.isNotBlank(id)) {
+ PgAlarm pgAlarm = pgAlarmManager.get(Long.valueOf(id));
+ if (pgAlarm == null)
+ msg = "不存在报警信息";
+ else {
+ pgReservePlanDtoList = pgReservePlanManager.getReservePlanDtoByAlarmType(pgAlarm);
- msg="关联预案获取成功";
+ if(pgReservePlanDtoList==null||pgReservePlanDtoList.size()==0)
+ msg="不存在关联的报警预案";
+ else
+ msg = "关联预案获取成功";
+ }
+ }
+ else
+ msg="请输入报警信息";
}
catch(Exception e)
{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
index 73adc78..29ce8a4 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgAlarmRuleRs.java
@@ -40,6 +40,7 @@
Map resultMap = new HashMap<>();
String msg = "";
+ System.out.println("devType:"+devType);
List pgAlarmRuleDtoList = new ArrayList<>();
try {
pgAlarmRuleDtoList = pgAlarmRuleManager.getAlarmRuleDto(devType);
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
new file mode 100644
index 0000000..19d3b8c
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanDto;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanRs")
+public class PgAssetPlanRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ /**
+ * 获取巡检记录
+ */
+ @POST
+ @Path("getPgAssetPlanList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanList(@FormParam("inSpectionPlace") String inSpectionPlace){
+ Map resultMap=new HashMap<>();
+ String msg="";
+
+ List pgAssetPlanDtoList=new ArrayList<>();
+ try{
+ pgAssetPlanDtoList=pgAssetPlanManager.getPgAssetPlanDtoList(inSpectionPlace);
+ if(pgAssetPlanDtoList!=null&&pgAssetPlanDtoList.size()!=0)
+ msg="巡检信息获取成功";
+ else
+ msg="不存在巡检信息";
+ }
+ catch(Exception ex){
+ ex.printStackTrace();
+ msg="巡检信息获取失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanDtoList);
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
new file mode 100644
index 0000000..47ef9d1
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/rs/PgAssetPlanStaticRs.java
@@ -0,0 +1,53 @@
+package com.casic.PgInterface.rs;
+
+import com.casic.PgInterface.maintenance.dto.PgAssetPlanStatic;
+import com.casic.PgInterface.maintenance.manager.PgAssetPlanManager;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import javax.ws.rs.FormParam;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@Path("pgAssetPlanStaticRs")
+public class PgAssetPlanStaticRs {
+
+ @Resource
+ private PgAssetPlanManager pgAssetPlanManager;
+
+ @POST
+ @Path("getPgAssetPlanStaticList")
+ @Produces(MediaType.APPLICATION_JSON)
+ public Map getPgAssetPlanStaticList(@FormParam("startTime") String startTime,
+ @FormParam("endTime") String endTime,
+ @FormParam("staticType") String staticType) throws Exception{
+ Map resultMap=new HashMap<>();
+ String msg="";
+ String result="";
+
+ List pgAssetPlanStaticList = null;
+ try{
+ pgAssetPlanStaticList=pgAssetPlanManager.getPgAssetPlanStaticLisByTime(startTime,endTime,staticType);
+ if(pgAssetPlanStaticList!=null&&pgAssetPlanStaticList.size()!=0)
+ msg="巡检统计信息获取成功";
+ else
+ msg="统计信息获取失败";
+ }
+ catch (Exception ex){
+ ex.printStackTrace();
+ msg="统计失败";
+ }
+
+ resultMap.put("msg",msg);
+ resultMap.put("result",pgAssetPlanStaticList);
+
+ return resultMap;
+ }
+
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
deleted file mode 100644
index 66f4d09..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordRs")
-public class PgAssetRecordRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- /**
- * 获取巡检记录
- */
- @POST
- @Path("getPgAssetRecordList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan,
- @FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime){
- Map resultMap=new HashMap<>();
- String msg="";
-
- List pgAssetInSpectionRecordDtoList=new ArrayList<>();
- try{
- pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime);
- if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0)
- msg="巡检信息获取成功";
- else
- msg="不存在巡检信息";
- }
- catch(Exception ex){
- ex.printStackTrace();
- msg="巡检信息获取失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordDtoList);
-
- return resultMap;
- }
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
deleted file mode 100644
index 5f0417a..0000000
--- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordStaticRs.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.casic.PgInterface.rs;
-
-import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic;
-import com.casic.PgInterface.maintenance.manager.PgAssetInSpectionRecordManager;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import javax.ws.rs.FormParam;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Component
-@Path("pgAssetRecordStaticRs")
-public class PgAssetRecordStaticRs {
-
- @Resource
- private PgAssetInSpectionRecordManager pgAssetInSpectionRecordManager;
-
- @POST
- @Path("getPgAssetRecordHeadStaticList")
- @Produces(MediaType.APPLICATION_JSON)
- public Map getPgAssetRecordHeadStaticList(@FormParam("startTime") String startTime,
- @FormParam("endTime") String endTime,
- @FormParam("staticType") String staticType) throws Exception{
- Map resultMap=new HashMap<>();
- String msg="";
- String result="";
-
- List pgAssetInSpectionRecordStaticList = null;
- try{
- pgAssetInSpectionRecordStaticList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordStaticLisByTime(startTime,endTime,staticType);
- if(pgAssetInSpectionRecordStaticList!=null&&pgAssetInSpectionRecordStaticList.size()!=0)
- msg="巡检统计信息获取成功";
- else
- msg="统计信息获取失败";
- }
- catch (Exception ex){
- ex.printStackTrace();
- msg="统计失败";
- }
-
- resultMap.put("msg",msg);
- resultMap.put("result",pgAssetInSpectionRecordStaticList);
-
- return resultMap;
- }
-
-
-}
\ No newline at end of file
diff --git a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
index 9dfdd88..a0245ba 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgConstructionRs.java
@@ -326,7 +326,7 @@
PgConstruction pgConstruction=pgConstructionManager.get(Long.valueOf(id));
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(pgConstruction.getPgName());
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPartition(pgConstruction.getPgName());
if(pgDeviceDtoList==null)
msg="信息获取失败";
diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
index 43e3244..96be38c 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java
@@ -286,7 +286,7 @@
try {
if (apCode != "") {
String apCodeStr=apCode.substring(0,3);
- pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition(apCodeStr);
+ pgDeviceDtoList=pgDeviceManager.getPgCameraListByPosition("",apCodeStr);
if(pgDeviceDtoList==null)
msg="不存在关联摄像机";
else
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..7920004
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/~$\350\257\264\346\230\21620190828.docx" "b/~$\350\257\264\346\230\21620190828.docx"
new file mode 100644
index 0000000..575ddd4
--- /dev/null
+++ "b/~$\350\257\264\346\230\21620190828.docx"
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190828.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190828.docx"
deleted file mode 100644
index 264ce46..0000000
--- "a/\346\216\245\345\217\243\350\257\264\346\230\21620190828.docx"
+++ /dev/null
Binary files differ
diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx"
new file mode 100644
index 0000000..0650e1e
--- /dev/null
+++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620190910.docx"
Binary files differ