diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
new file mode 100644
index 0000000..7907e66
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.patroler.dto;
+
+/**
+ * Created by yxw on 2017/12/14.
+ */
+public class PgAlarmRule {
+}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
new file mode 100644
index 0000000..7907e66
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.patroler.dto;
+
+/**
+ * Created by yxw on 2017/12/14.
+ */
+public class PgAlarmRule {
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index 3992a32..38c31e9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCh4InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCh4DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
@@ -116,6 +116,4 @@
return resultMap;
}
-
-
}
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
new file mode 100644
index 0000000..7907e66
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.patroler.dto;
+
+/**
+ * Created by yxw on 2017/12/14.
+ */
+public class PgAlarmRule {
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index 3992a32..38c31e9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCh4InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCh4DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
@@ -116,6 +116,4 @@
return resultMap;
}
-
-
}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index 0bbfdc2..4312782 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCoInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCoDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
new file mode 100644
index 0000000..7907e66
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.patroler.dto;
+
+/**
+ * Created by yxw on 2017/12/14.
+ */
+public class PgAlarmRule {
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index 3992a32..38c31e9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCh4InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCh4DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
@@ -116,6 +116,4 @@
return resultMap;
}
-
-
}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index 0bbfdc2..4312782 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCoInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCoDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 691cf44..0292e79 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getO2InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getO2InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgO2DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
new file mode 100644
index 0000000..7907e66
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.patroler.dto;
+
+/**
+ * Created by yxw on 2017/12/14.
+ */
+public class PgAlarmRule {
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index 3992a32..38c31e9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCh4InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCh4DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
@@ -116,6 +116,4 @@
return resultMap;
}
-
-
}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index 0bbfdc2..4312782 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCoInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCoDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 691cf44..0292e79 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getO2InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getO2InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgO2DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 673612b..18e66fd 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getShInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getShInfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getShInfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgShDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
new file mode 100644
index 0000000..7907e66
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.patroler.dto;
+
+/**
+ * Created by yxw on 2017/12/14.
+ */
+public class PgAlarmRule {
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index 3992a32..38c31e9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCh4InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCh4DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
@@ -116,6 +116,4 @@
return resultMap;
}
-
-
}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index 0bbfdc2..4312782 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCoInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCoDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 691cf44..0292e79 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getO2InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getO2InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgO2DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 673612b..18e66fd 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getShInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getShInfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getShInfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgShDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a5ae51e..b10200a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getTempHumInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getTempHumInfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getTempHumInfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgTempHumDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
new file mode 100644
index 0000000..7907e66
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.patroler.dto;
+
+/**
+ * Created by yxw on 2017/12/14.
+ */
+public class PgAlarmRule {
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index 3992a32..38c31e9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCh4InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCh4DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
@@ -116,6 +116,4 @@
return resultMap;
}
-
-
}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index 0bbfdc2..4312782 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCoInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCoDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 691cf44..0292e79 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getO2InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getO2InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgO2DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 673612b..18e66fd 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getShInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getShInfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getShInfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgShDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a5ae51e..b10200a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getTempHumInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getTempHumInfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getTempHumInfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgTempHumDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx"
new file mode 100644
index 0000000..964daa9
--- /dev/null
+++ "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx"
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
new file mode 100644
index 0000000..7907e66
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.patroler.dto;
+
+/**
+ * Created by yxw on 2017/12/14.
+ */
+public class PgAlarmRule {
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index 3992a32..38c31e9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCh4InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCh4DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
@@ -116,6 +116,4 @@
return resultMap;
}
-
-
}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index 0bbfdc2..4312782 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCoInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCoDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 691cf44..0292e79 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getO2InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getO2InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgO2DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 673612b..18e66fd 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getShInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getShInfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getShInfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgShDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a5ae51e..b10200a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getTempHumInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getTempHumInfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getTempHumInfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgTempHumDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx"
new file mode 100644
index 0000000..964daa9
--- /dev/null
+++ "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx"
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx"
new file mode 100644
index 0000000..4f71cd9
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx"
Binary files differ
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..92e32d0
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,1395 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ localhost
+ 5050
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510216318970
+ 1510216318970
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1510219102698
+ 1510219102698
+
+
+ 1510733007338
+ 1510733007338
+
+
+ 1511245470124
+ 1511245470124
+
+
+ 1511253700715
+ 1511253700715
+
+
+ 1511418488391
+ 1511418488391
+
+
+ 1511854588462
+ 1511854588462
+
+
+ 1512955169294
+ 1512955169294
+
+
+ 1513847487904
+ 1513847487904
+
+
+ 1514511858811
+ 1514511858811
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ Web
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ PgInterface
+
+
+
+
+
+
+
+ 1.7
+
+
+
+
+
+
+
+ Maven: antlr:antlr:2.7.7
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
index e9adce6..aba71a2 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCh4Dto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCh4.getLogTime()));
this.setUpTime(sdf.format(pgCh4.getUpTime()));
this.setDevCode(pgCh4.getPgDeviceId().getDevCode());
- this.setDevName(pgCh4.getPgDeviceId().getDevName());
+ this.setDevName(pgCh4.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
index 2531ea1..629b2df 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgCoDto.java
@@ -74,7 +74,7 @@
this.setLogTime(sdf.format(pgCo.getLogTime()));
this.setUpTime(sdf.format(pgCo.getUpTime()));
this.setDevCode(pgCo.getPgDeviceId().getDevCode());
- this.setDevName(pgCo.getPgDeviceId().getDevName());
+ this.setDevName(pgCo.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
index dd0f849..c3928ac 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgLocationDto.java
@@ -91,7 +91,7 @@
this.setUserName(pgLocation.getPgPatrolerId().getUserName());
this.setDepartment(pgLocation.getPgPatrolerId().getDepartment());
this.setPost(pgLocation.getPgPatrolerId().getPost());
- this.setDevice(pgLocation.getPgDeviceId().getDevName());
+ this.setDevice(pgLocation.getPgDeviceId().getAssetName());
this.setIntoTime(sdf.format(pgLocation.getIntoTime()));
this.setOutTime(sdf.format(pgLocation.getOutTime()));
this.setPosition(pgLocation.getPosition());
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
index 1b506b3..6429740 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgO2Dto.java
@@ -74,7 +74,7 @@
this.setUpTime(sdf.format(pgO2.getUpTime()));
this.setLogTime(sdf.format(pgO2.getLogTime()));
this.setDevCode(pgO2.getPgDeviceId().getDevCode());
- this.setDevName(pgO2.getPgDeviceId().getDevName());
+ this.setDevName(pgO2.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
index 8775ac5..d0ffe78 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgShDto.java
@@ -74,6 +74,6 @@
this.setUpTime(sdf.format(pgSh.getUpTime()));
this.setLogTime(sdf.format(pgSh.getLogTime()));
this.setDevCode(pgSh.getPgDeviceId().getDevCode());
- this.setDevName(pgSh.getPgDeviceId().getDevName());
+ this.setDevName(pgSh.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
index 271cb7a..db9cfda 100644
--- a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHumDto.java
@@ -84,7 +84,7 @@
this.setLogTime(sdf.format(pgTempHum.getLogTime()));
this.setUpTime(sdf.format(pgTempHum.getUpTime()));
this.setDevCode(pgTempHum.getPgDeviceId().getDevCode());
- this.setDevName(pgTempHum.getPgDeviceId().getDevName());
+ this.setDevName(pgTempHum.getPgDeviceId().getAssetName());
}
}
diff --git a/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
new file mode 100644
index 0000000..b2affe5
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/devData/dto/PgTempHunDto.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.devData.dto;
+
+/**
+ * Created by yxw on 2017/11/28.
+ */
+public class PgTempHunDto {
+}
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 758049e..96bd97a 100644
--- a/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
+++ b/src/main/java/com/casic/PgInterface/devTable/manager/PgDeviceManager.java
@@ -35,9 +35,9 @@
}
//根据名字获取当前设备
- public PgDevice getDeviceBydevName(String devName) {
+ public PgDevice getDeviceByAssetCode(String assetCode) {
Criteria criteria=createCriteria(PgDevice.class);
- criteria.add(Restrictions.eq("devName",devName));
+ criteria.add(Restrictions.eq("assetCode",assetCode));
List pgDeviceList=criteria.list();
if(pgDeviceList.size()==0)
diff --git a/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
new file mode 100644
index 0000000..7907e66
--- /dev/null
+++ b/src/main/java/com/casic/PgInterface/patroler/dto/PgAlarmRule.java
@@ -0,0 +1,7 @@
+package com.casic.PgInterface.patroler.dto;
+
+/**
+ * Created by yxw on 2017/12/14.
+ */
+public class PgAlarmRule {
+}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
index 3992a32..38c31e9 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCh4Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCh4InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCh4DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
@@ -116,6 +116,4 @@
return resultMap;
}
-
-
}
diff --git a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
index 0bbfdc2..4312782 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgCoRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getCoInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getCh4InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getCh4InfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgCoDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
index 691cf44..0292e79 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgO2Rs.java
@@ -47,7 +47,7 @@
@POST
@Path("getO2InfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getO2InfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getO2InfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgO2DtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgShRs.java b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
index 673612b..18e66fd 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgShRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgShRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getShInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getShInfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getShInfoByDevAndDate(@FormParam("assetCode") String assetCode,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgShDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetCode);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
index a5ae51e..b10200a 100644
--- a/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
+++ b/src/main/java/com/casic/PgInterface/rs/PgTempHumRs.java
@@ -47,7 +47,7 @@
@POST
@Path("getTempHumInfoByDevAndDate")
@Produces(MediaType.APPLICATION_JSON)
- public Map getTempHumInfoByDevAndDate(@FormParam("devName") String devName,
+ public Map getTempHumInfoByDevAndDate(@FormParam("assetName") String assetName,
@FormParam("startDate") String startDate,
@FormParam("endDate") String endDate)throws Exception {
Map resultMap = new HashMap();
@@ -55,7 +55,7 @@
List pgTempHumDtoList=new ArrayList();
try {
- PgDevice pgDevice=pgDeviceManager.getDeviceBydevName(devName);
+ PgDevice pgDevice=pgDeviceManager.getDeviceByAssetCode(assetName);
if(pgDevice==null)
msg="设备不存在";
else{
diff --git "a/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx"
new file mode 100644
index 0000000..964daa9
--- /dev/null
+++ "b/~$\346\216\245\345\217\243\350\257\264\346\230\216.docx"
Binary files differ
diff --git "a/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx"
new file mode 100644
index 0000000..4f71cd9
--- /dev/null
+++ "b/~$\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx"
Binary files differ
diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx"
index 966901a..c7e159f 100644
--- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx"
+++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\216.docx"
Binary files differ